Upgrade to Gradle 8.2.1 and upgrade plugins

ejona86 · ejona86 · commit f3f4ed4ef30d · 2023-08-02T13:29:44.000-07:00
Most changes are migrating from conventions to the equivalent extensions. JMH, AppEngine, and Jib plugins trigger future compatibility warnings with `--warning-mode all`. The movement of configurations was to allow sourceSets to create the configurations and then we just configure them. When configurations were before sourceSets, we'd implicitly create the configuration. The examples were _not_ updated to the newer Gradle, although the non-Android examples work with the newer Gradle. The Android examples use an older Android Gradle Plugin which will need to be upgraded first. grpc#10445
diff --git a/README.md b/README.md
@@ -152,7 +152,7 @@ For non-Android protobuf-based codegen integrated with the Gradle build system,
 you can use [protobuf-gradle-plugin][]:
 ```gradle
 plugins {
-    id 'com.google.protobuf' version '0.9.1'
+    id 'com.google.protobuf' version '0.9.4'
 }
 
 protobuf {
@@ -185,7 +185,7 @@ use protobuf-gradle-plugin but specify the 'lite' options:
 
 ```gradle
 plugins {
-    id 'com.google.protobuf' version '0.9.1'
+    id 'com.google.protobuf' version '0.9.4'
 }
 
 protobuf {
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
@@ -122,4 +122,16 @@ tasks.withType(JavaCompile).configureEach {
             "|")
 }
 
+afterEvaluate {
+    // Hack to workaround "Task ':grpc-android-interop-testing:extractIncludeDebugProto' uses this
+    // output of task ':grpc-context:jar' without declaring an explicit or implicit dependency." The
+    // issue started when grpc-context became empty.
+    tasks.named('extractIncludeDebugProto').configure {
+        dependsOn project(':grpc-context').tasks.named('jar')
+    }
+    tasks.named('extractIncludeReleaseProto').configure {
+        dependsOn project(':grpc-context').tasks.named('jar')
+    }
+}
+
 configureProtoCompilation()
diff --git a/api/build.gradle b/api/build.gradle
@@ -20,8 +20,8 @@ tasks.named("compileContextJava").configure {
     if (JavaVersion.current().isJava9Compatible()) {
         options.release = 7
     } else {
-        sourceCompatibility = 1.7
-        targetCompatibility = 1.7
+        sourceCompatibility = JavaVersion.VERSION_1_7
+        targetCompatibility = JavaVersion.VERSION_1_7
     }
 }
 
diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -105,12 +105,14 @@ def benchmark_worker = tasks.register("benchmark_worker", CreateStartScripts) {
     classpath = startScripts.classpath
 }
 
-applicationDistribution.into("bin") {
-    from(qps_client)
-    from(openloop_client)
-    from(qps_server)
-    from(benchmark_worker)
-    fileMode = 0755
+application {
+    applicationDistribution.into("bin") {
+        from(qps_client)
+        from(openloop_client)
+        from(qps_server)
+        from(benchmark_worker)
+        fileMode = 0755
+    }
 }
 
 publishing {
diff --git a/build.gradle b/build.gradle
@@ -241,8 +241,8 @@ subprojects {
             if (JavaVersion.current().isJava9Compatible()) {
                 options.release = 8
             } else {
-                sourceCompatibility = 1.8
-                targetCompatibility = 1.8
+                sourceCompatibility = JavaVersion.VERSION_1_8
+                targetCompatibility = JavaVersion.VERSION_1_8
             }
         }
         tasks.named("compileJava").configure {
diff --git a/compiler/build.gradle b/compiler/build.gradle
@@ -136,8 +136,10 @@ model {
     }
 }
 
-configurations {
-    testLiteImplementation
+sourceSets {
+    testLite {
+        proto { setSrcDirs(['src/test/proto']) }
+    }
 }
 
 dependencies {
@@ -149,12 +151,6 @@ dependencies {
             libraries.javax.annotation
 }
 
-sourceSets {
-    testLite {
-        proto { setSrcDirs(['src/test/proto']) }
-    }
-}
-
 tasks.named("compileTestJava").configure {
     options.errorprone.excludedPaths = ".*/build/generated/source/proto/.*"
 }
@@ -214,7 +210,9 @@ tasks.register("buildArtifacts", Copy) {
     into artifactStagingPath
 }
 
-archivesBaseName = "$protocPluginBaseName"
+base {
+    archivesName = "$protocPluginBaseName"
+}
 
 def checkArtifacts = tasks.register("checkArtifacts") {
     dependsOn buildArtifacts
diff --git a/examples/android/clientcache/build.gradle b/examples/android/clientcache/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.1"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.1"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.1"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/android/strictmode/build.gradle b/examples/android/strictmode/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.1"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     // Provide convenience executables for trying out the examples.
     id 'application'
-    id 'com.google.protobuf' version '0.9.1'
+    id 'com.google.protobuf' version '0.9.4'
     // Generate IntelliJ IDEA's .idea & .iml project files
     id 'idea'
 }
@@ -13,8 +13,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle
@@ -15,8 +15,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle
@@ -15,8 +15,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle
@@ -15,8 +15,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle
@@ -16,8 +16,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle
@@ -13,8 +13,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle
@@ -14,8 +14,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle
@@ -14,8 +14,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protocVersion = '3.23.4'
diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle
@@ -14,8 +14,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protocVersion = '3.23.4'
diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle
@@ -12,8 +12,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 def protocVersion = '3.23.4'
diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle
@@ -15,8 +15,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle
@@ -14,8 +14,10 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 // IMPORTANT: You probably want the non-SNAPSHOT version of gRPC. Make sure you
 // are looking at a tagged version of the example and not "master"!
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle
@@ -158,22 +158,24 @@ def xds_federation_test_client = tasks.register("xds_federation_test_client", Cr
     classpath = startScripts.classpath
 }
 
-applicationDistribution.into("bin") {
-    from(test_client)
-    from(test_server)
-    from(reconnect_test_client)
-    from(stresstest_client)
-    from(http2_client)
-    from(grpclb_long_lived_affinity_test_client)
-    from(grpclb_fallback_test_client)
-    from(xds_test_client)
-    from(xds_test_server)
-    from(xds_federation_test_client)
-    fileMode = 0755
-}
-
-applicationDistribution.into("lib") {
-    from(configurations.alpnagent)
+application {
+    applicationDistribution.into("bin") {
+        from(test_client)
+        from(test_server)
+        from(reconnect_test_client)
+        from(stresstest_client)
+        from(http2_client)
+        from(grpclb_long_lived_affinity_test_client)
+        from(grpclb_fallback_test_client)
+        from(xds_test_client)
+        from(xds_test_server)
+        from(xds_federation_test_client)
+        fileMode = 0755
+    }
+
+    applicationDistribution.into("lib") {
+        from(configurations.alpnagent)
+    }
 }
 
 publishing {
diff --git a/netty/shaded/build.gradle b/netty/shaded/build.gradle
@@ -1,9 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
+import org.apache.tools.zip.ZipOutputStream
+import org.apache.tools.zip.ZipEntry
 import org.gradle.api.file.FileTreeElement
-import shadow.org.apache.tools.zip.ZipOutputStream
-import shadow.org.apache.tools.zip.ZipEntry
 
 plugins {
     id "java"
diff --git a/servlet/build.gradle b/servlet/build.gradle
diff --git a/servlet/jakarta/build.gradle b/servlet/jakarta/build.gradle
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ For non-Android protobuf-based codegen integrated with the Gradle build system,`
`152`	`152`	`you can use [protobuf-gradle-plugin][]:`
`153`	`153`	```gradle
`154`	`154`	`plugins {`
`155`		`- id 'com.google.protobuf' version '0.9.1'`
	`155`	`+ id 'com.google.protobuf' version '0.9.4'`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`protobuf {`
`@@ -185,7 +185,7 @@ use protobuf-gradle-plugin but specify the 'lite' options:`
`185`	`185`
`186`	`186`	```gradle
`187`	`187`	`plugins {`
`188`		`- id 'com.google.protobuf' version '0.9.1'`
	`188`	`+ id 'com.google.protobuf' version '0.9.4'`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`protobuf {`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ tasks.named("compileContextJava").configure {`
`20`	`20`	`if (JavaVersion.current().isJava9Compatible()) {`
`21`	`21`	`options.release = 7`
`22`	`22`	`} else {`
`23`		`- sourceCompatibility = 1.7`
`24`		`- targetCompatibility = 1.7`
	`23`	`+ sourceCompatibility = JavaVersion.VERSION_1_7`
	`24`	`+ targetCompatibility = JavaVersion.VERSION_1_7`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,8 @@ subprojects {`
`241`	`241`	`if (JavaVersion.current().isJava9Compatible()) {`
`242`	`242`	`options.release = 8`
`243`	`243`	`} else {`
`244`		`- sourceCompatibility = 1.8`
`245`		`- targetCompatibility = 1.8`
	`244`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`245`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`	`tasks.named("compileJava").configure {`
Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,10 @@ model {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`-configurations {`
`140`		`- testLiteImplementation`
	`139`	`+sourceSets {`
	`140`	`+ testLite {`
	`141`	`+ proto { setSrcDirs(['src/test/proto']) }`
	`142`	`+ }`
`141`	`143`	`}`
`142`	`144`
`143`	`145`	`dependencies {`
`@@ -149,12 +151,6 @@ dependencies {`
`149`	`151`	`libraries.javax.annotation`
`150`	`152`	`}`
`151`	`153`
`152`		`-sourceSets {`
`153`		`- testLite {`
`154`		`- proto { setSrcDirs(['src/test/proto']) }`
`155`		`- }`
`156`		`-}`
`157`		`-`
`158`	`154`	`tasks.named("compileTestJava").configure {`
`159`	`155`	`options.errorprone.excludedPaths = "./build/generated/source/proto/."`
`160`	`156`	`}`
`@@ -214,7 +210,9 @@ tasks.register("buildArtifacts", Copy) {`
`214`	`210`	`into artifactStagingPath`
`215`	`211`	`}`
`216`	`212`
`217`		`-archivesBaseName = "$protocPluginBaseName"`
	`213`	`+base {`
	`214`	`+ archivesName = "$protocPluginBaseName"`
	`215`	`+}`
`218`	`216`
`219`	`217`	`def checkArtifacts = tasks.register("checkArtifacts") {`
`220`	`218`	`dependsOn buildArtifacts`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`	`9`	`classpath 'com.android.tools.build:gradle:4.2.0'`
`10`		`- classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.1"`
	`10`	`+ classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.4"`
`11`	`11`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`13`	`13`	`// in the individual module build.gradle files`