Bumping to Gradle9

Author: oldergod

gen-tests.gradle.kts

@@ -35,7 +35,7 @@ dependencies {
 
 // JAVA
 
-val generateJavaTests by tasks.creating(JavaExec::class) {
+val generateJavaTests by tasks.registering(JavaExec::class) {
   group = "Generate Tests"
   description = "Generates Java classes from the test protos"
   classpath = wire
@@ -47,7 +47,7 @@ val generateJavaTests by tasks.creating(JavaExec::class) {
   ) + PROTOS
 }
 
-val generateKotlinClassAmongJavaTests by tasks.creating(JavaExec::class) {
+val generateKotlinClassAmongJavaTests by tasks.registering(JavaExec::class) {
   group = "Generate Tests"
   description = "Generates Kotlin classes from the Java test protos"
   classpath = wire
@@ -61,7 +61,7 @@ val generateKotlinClassAmongJavaTests by tasks.creating(JavaExec::class) {
 
 // NO OPTIONS
 
-val generateNoOptionsTests by tasks.creating(JavaExec::class) {
+val generateNoOptionsTests by tasks.registering(JavaExec::class) {
   group = "Generate Tests"
   description = "Generates Java classes with no options from the test protos"
   classpath = wire
@@ -155,7 +155,7 @@ val generateGsonAdapterKotlinTests by tasks.creating(JavaExec::class) {
   )
 }
 
-val generateGsonTests by tasks.creating {
+val generateGsonTests by tasks.registering {
   group = "Generate Tests"
   description = "Generates Java and Kotlin classes that use Gson from the test protos"
   dependsOn(
@@ -536,7 +536,7 @@ val generateSwiftProto2Tests by tasks.creating(JavaExec::class) {
   )
 }
 
-val generateSwiftTests by tasks.creating {
+val generateSwiftTests by tasks.registering {
   group = "Generate Tests"
   description = "Generates Swift classes from the test protos"
   if (project.properties.get("swift") != "false") {
@@ -638,7 +638,7 @@ val generateMoshiAdapterKotlinTests by tasks.creating(JavaExec::class) {
   )
 }
 
-val generateMoshiTests by tasks.creating {
+val generateMoshiTests by tasks.registering {
   group = "Generate Tests"
   description = "Generates Java and Kotlin classes that use Moshi from the test protos"
   dependsOn(
@@ -695,7 +695,7 @@ val generateSharedJsonKotlinTests by tasks.creating(JavaExec::class) {
   )
 }
 
-val generateSharedJson by tasks.creating {
+val generateSharedJson by tasks.registering {
   group = "Generate Tests"
   description = "Generates Java and Kotlin classes for shared JSON tests"
   dependsOn(
@@ -704,7 +704,7 @@ val generateSharedJson by tasks.creating {
   )
 }
 
-val generateTests by tasks.creating {
+val generateTests by tasks.registering {
   group = "Generate Tests"
   description = "Generates all test classes"
   dependsOn(

wire-benchmarks/build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 sourceSets {
   main {
     // Adds protobuf generated classes to our source sets.
-    java.srcDir("$buildDir/generated/source/proto/main/java")
+    java.srcDir(layout.buildDirectory.dir("generated/source/proto/main/java"))
   }
 }
 

wire-reflector/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 val main by sourceSets.getting {
-  java.srcDir("$buildDir/wire")
+  java.srcDir(layout.buildDirectory.dir("wire"))
 }
 
 dependencies {
@@ -35,7 +35,7 @@ val generateReflectionProtos by tasks.registering(JavaExec::class) {
   classpath = generateReflectionProtosClasspath
   args(
     "--proto_path=$projectDir/src/main/resources",
-    "--kotlin_out=$buildDir/wire",
+    "--kotlin_out=${layout.buildDirectory.get()}/wire",
     "grpc/reflection/v1alpha/reflection.proto"
   )
 }

wire-tests/build.gradle.kts

@@ -131,10 +131,11 @@ kotlin {
 }
 
 val jvmTest by tasks.getting
+val jvmTestTask = jvmTest
 
 for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
   target.project.sourceSets {
-    val test by getting {
+    val jvmTest by getting {
       java.srcDir("src/jvmTest/proto-java")
     }
 
@@ -146,7 +147,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = javaTest.runtimeClasspath
       testClassesDirs = javaTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJavaTest)
+    jvmTestTask.dependsOn(jvmJavaTest)
 
     val javaNoOptionsTest by creating {
       java.srcDir("src/jvmJavaNoOptionsTest/proto-java")
@@ -155,7 +156,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = javaNoOptionsTest.runtimeClasspath
       testClassesDirs = javaNoOptionsTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJavaNoOptionsTest)
+    jvmTestTask.dependsOn(jvmJavaNoOptionsTest)
 
     val javaCompactTest by creating {
       java.srcDir("src/jvmJavaCompactTest/proto-java")
@@ -164,7 +165,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = javaCompactTest.runtimeClasspath
       testClassesDirs = javaCompactTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJavaCompactTest)
+    jvmTestTask.dependsOn(jvmJavaCompactTest)
 
     val javaPrunedTest by creating {
       java.srcDir("src/jvmJavaPrunedTest/proto-java")
@@ -173,7 +174,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = javaPrunedTest.runtimeClasspath
       testClassesDirs = javaPrunedTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJavaPrunedTest)
+    jvmTestTask.dependsOn(jvmJavaPrunedTest)
 
     val javaAndroidTest by creating {
       java.srcDir("src/jvmJavaAndroidTest/proto-java")
@@ -182,7 +183,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = javaAndroidTest.runtimeClasspath
       testClassesDirs = javaAndroidTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJavaAndroidTest)
+    jvmTestTask.dependsOn(jvmJavaAndroidTest)
 
     val javaAndroidCompactTest by creating {
       java.srcDir("src/jvmJavaAndroidCompactTest/proto-java")
@@ -191,7 +192,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = javaAndroidCompactTest.runtimeClasspath
       testClassesDirs = javaAndroidCompactTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJavaAndroidCompactTest)
+    jvmTestTask.dependsOn(jvmJavaAndroidCompactTest)
 
     val jsonJavaTest by creating {
       java.srcDir("src/jvmJsonTest/kotlin")
@@ -201,7 +202,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = jsonJavaTest.runtimeClasspath
       testClassesDirs = jsonJavaTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJsonJavaTest)
+    jvmTestTask.dependsOn(jvmJsonJavaTest)
 
     val jsonKotlinTest by creating {
       java.srcDir("src/jvmJsonTest/kotlin")
@@ -211,7 +212,7 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       classpath = jsonKotlinTest.runtimeClasspath
       testClassesDirs = jsonKotlinTest.output.classesDirs
     }
-    jvmTest.dependsOn(jvmJsonKotlinTest)
+    jvmTestTask.dependsOn(jvmJsonKotlinTest)
 
     dependencies {
       add("javaTestImplementation", projects.wireRuntime)
@@ -247,10 +248,10 @@ for (target in kotlin.targets.matching { it.platformType.name == "jvm" }) {
       add("jsonKotlinTestImplementation", libs.jimfs)
       add("jsonKotlinTestImplementation", libs.truth)
 
-      add("jvmJavaTestImplementation", projects.wireMoshiAdapter)
-      add("jvmJavaTestImplementation", libs.kotlin.reflect)
-      add("jvmJavaTestImplementation", libs.moshi)
-      add("jvmJavaTestImplementation", libs.moshiKotlin)
+      add("jvmTestImplementation", projects.wireMoshiAdapter)
+      add("jvmTestImplementation", libs.kotlin.reflect)
+      add("jvmTestImplementation", libs.moshi)
+      add("jvmTestImplementation", libs.moshiKotlin)
     }
   }
 }