Bumping to Gradle9

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(

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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-gradle-plugin/src/test/projects/java-project-java-protos/build.gradle

@@ -15,7 +15,7 @@ buildscript {
 apply plugin: 'application'
 apply plugin: 'com.squareup.wire'
 
-mainClassName = 'com.squareup.dinosaurs.Sample'
+application.mainClass = "com.squareup.dinosaurs.Sample"
 
 repositories {
   maven {

wire-gradle-plugin/src/test/projects/java-project-kotlin-protos/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'application'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'com.squareup.wire'
 
-mainClassName = 'com.squareup.dinosaurs.Sample'
+application.mainClass = "com.squareup.dinosaurs.Sample"
 
 repositories {
   maven {

wire-gradle-plugin/src/test/projects/kotlin-project-java-protos/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'application'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'com.squareup.wire'
 
-mainClassName = 'com.squareup.dinosaurs.Sample'
+application.mainClass = "com.squareup.dinosaurs.Sample"
 
 repositories {
   maven {

wire-gradle-plugin/src/test/projects/kotlin-project-kotlin-protos/build.gradle

@@ -19,7 +19,8 @@ apply plugin: 'application'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'com.squareup.wire'
 
-mainClassName = 'com.squareup.dinosaurs.Sample'
+application.mainClass = "com.squareup.dinosaurs.Sample"
+
 
 repositories {
   maven {

wire-gradle-plugin/src/test/projects/sourcedir-exclude/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'application'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'com.squareup.wire'
 
-mainClassName = 'com.squareup.dinosaurs.Sample'
+application.mainClass = "com.squareup.dinosaurs.Sample"
 
 repositories {
   maven {

wire-gradle-plugin/src/test/projects/sourcedir-include/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'application'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'com.squareup.wire'
 
-mainClassName = 'com.squareup.dinosaurs.Sample'
+application.mainClass = "com.squareup.dinosaurs.Sample"
 
 repositories {
   maven {

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"
   )
 }