holding back coroutines and updating gradle

robertfmurdock · Dec 21, 2024 · 365bf89 · 365bf89
1 parent 8283243
commit 365bf89
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 19 deletions.
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -33,7 +33,7 @@ tasks {
     clean {
         dependsOn(provider { gradle.includedBuilds.map { it.task(":clean") }.toList() })
     }
-    create("versionCatalogUpdate") {
+    register("versionCatalogUpdate") {
         dependsOn(provider { gradle.includedBuilds.map { it.task(":versionCatalogUpdate") }.toList() })
     }
     register("formatKotlin") {
@@ -42,7 +42,7 @@ tasks {
     val testBuilds = listOf(
         gradle.includedBuild("tools"),
     )
-    create<Copy>("collectResults") {
+    register<Copy>("collectResults") {
         dependsOn(provider { (getTasksByName("collectResults", true) - this).toList() })
         dependsOn(provider { testBuilds.map { it.task(":collectResults") } })
         from(testBuilds.map { it.projectDir.resolve("build/test-output") })

diff --git a/command-line-tools/build.gradle.kts b/command-line-tools/build.gradle.kts
@@ -21,7 +21,7 @@ tasks {
     assemble { dependsOn(provider { (getTasksByName("assemble", true) - this).toList() }) }
     check { dependsOn(provider { (getTasksByName("check", true) - this).toList() }) }
     clean { dependsOn(provider { (getTasksByName("clean", true) - this).toList() }) }
-    create("collectResults") {
+    register("collectResults") {
         dependsOn(provider { (getTasksByName("collectResults", true) - this).toList() })
     }
     register("formatKotlin") {

diff --git a/command-line-tools/digger-cli/build.gradle.kts b/command-line-tools/digger-cli/build.gradle.kts
@@ -99,7 +99,7 @@ tasks {
         workingDir(mainNpmProjectDir)
         commandLine("npm", "publish")
     }
-    val publish by creating {
+    val publish by registering {
         dependsOn(jsPublish)
         mustRunAfter(check)
     }

diff --git a/command-line-tools/tagger-cli/build.gradle.kts b/command-line-tools/tagger-cli/build.gradle.kts
@@ -105,7 +105,7 @@ tasks {
     check {
         dependsOn(confirmTaggerCanRun)
     }
-    val publish by creating {
+    val publish by registering {
         dependsOn(jsPublish)
         mustRunAfter(check)
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/library.gradle.kts b/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/library.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 }
 
 tasks {
-    val javadocJar by creating(Jar::class) {
+    val javadocJar by registering(Jar::class, fun Jar.() {
         archiveClassifier.set("javadoc")
         from("${rootDir.absolutePath}/javadocs")
-    }
+    })
     publishing.publications {
         withType<MavenPublication> { artifact(javadocJar) }
     }

diff --git a/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/reports.gradle.kts b/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/reports.gradle.kts
@@ -11,12 +11,12 @@ tasks {
         )
 
     val check by getting
-    val copyReportsToRootDirectory by creating(Copy::class) {
+    val copyReportsToRootDirectory by registering(Copy::class) {
         mustRunAfter(check)
         from("build/reports")
         into(projectResultPath)
     }
-    val copyTestResultsToRootDirectory by creating(Copy::class) {
+    val copyTestResultsToRootDirectory by registering(Copy::class) {
         mustRunAfter(check)
         from("build/test-results")
         into(projectResultPath)

diff --git a/tools/build.gradle.kts b/tools/build.gradle.kts
@@ -16,7 +16,7 @@ tasks {
     assemble { dependsOn(provider { (getTasksByName("assemble", true) - this).toList() }) }
     check { dependsOn(provider { (getTasksByName("check", true) - this).toList() }) }
     clean { dependsOn(provider { (getTasksByName("clean", true) - this).toList() }) }
-    create("collectResults") {
+    register("collectResults") {
         dependsOn(provider { (getTasksByName("collectResults", true) - this).toList() })
     }
     register("formatKotlin") {

diff --git a/tools/git-test/build.gradle.kts b/tools/git-test/build.gradle.kts
@@ -10,6 +10,7 @@ kotlin {
 dependencies {
     commonMainImplementation(platform(project(":dependency-bom")))
     commonMainImplementation(project(":git-adapter"))
+    commonMainImplementation(kotlin("stdlib", embeddedKotlinVersion))
     commonMainImplementation(kotlin("test"))
     commonMainImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     commonMainApi("org.jetbrains.kotlinx:kotlinx-coroutines-test")

diff --git a/tools/gradle/libs.versions.toml b/tools/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [libraries]
 com-benasher44-uuid = "com.benasher44:uuid:0.8.4"
-org-jetbrains-kotlinx-kotlinx-coroutines-bom = "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.1"
+# @pin
+org-jetbrains-kotlinx-kotlinx-coroutines-bom = "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"
 org-jetbrains-kotlinx-kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
 # @pin
 org-jetbrains-kotlinx-kotlinx-serialization-bom = "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"

diff --git a/tools/tagger-plugin/src/test/kotlin/com/zegreatrob/tools/tagger/TaggerPluginTest.kt b/tools/tagger-plugin/src/test/kotlin/com/zegreatrob/tools/tagger/TaggerPluginTest.kt
@@ -29,7 +29,7 @@ class TaggerPluginTest {
             .build()
         rootProject.plugins.apply("com.zegreatrob.tools.tagger")
         val rootCheck = rootProject.tasks.named("check").get()
-        val innerProject1Check = innerProject1.tasks.create("check")
+        val innerProject1Check = innerProject1.tasks.register("check")
 
         val tagTask = rootProject.tasks.findByName("tag")!!
 
@@ -40,7 +40,7 @@ class TaggerPluginTest {
         )
         assertTrue(
             tagTask.mustRunAfter.getDependencies(tagTask)
-                .contains(innerProject1Check),
+                .contains(innerProject1Check.get()),
             "Did not run after inner project check",
         )
     }