Merge branch 'grpc:master' into master

alts/build.gradle

@@ -17,12 +17,12 @@ dependencies {
             project(':grpc-grpclb'),
             project(':grpc-protobuf'),
             project(':grpc-stub'),
-            libraries.protobuf,
+            libraries.protobuf.java,
             libraries.conscrypt,
             libraries.guava,
-            libraries.google_auth_oauth2_http
+            libraries.google.auth.oauth2Http
     def nettyDependency = implementation project(':grpc-netty')
-    compileOnly libraries.javax_annotation
+    compileOnly libraries.javax.annotation
 
     shadow configurations.implementation.getDependencies().minus(nettyDependency)
     shadow project(path: ':grpc-netty-shaded', configuration: 'shadow')
@@ -32,14 +32,18 @@ dependencies {
             project(':grpc-testing-proto'),
             libraries.guava,
             libraries.junit,
-            libraries.mockito,
+            libraries.mockito.core,
             libraries.truth
 
-    testImplementation (libraries.guava_testlib) {
+    testImplementation (libraries.guava.testlib) {
         exclude group: 'junit', module: 'junit'
     }
-    testRuntimeOnly libraries.netty_tcnative,
-            libraries.netty_epoll
+    testRuntimeOnly libraries.netty.tcnative
+    testRuntimeOnly (libraries.netty.transport.epoll) {
+        artifact {
+            classifier = "linux-x86_64"
+        }
+    }
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

android-interop-testing/build.gradle

@@ -56,7 +56,7 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.multidex:multidex:2.0.0'
-    implementation libraries.androidx_annotation
+    implementation libraries.androidx.annotation
     implementation 'com.google.android.gms:play-services-base:18.0.1'
 
     implementation project(':grpc-auth'),
@@ -68,17 +68,17 @@ dependencies {
             libraries.hdrhistogram,
             libraries.junit,
             libraries.truth,
-            libraries.opencensus_contrib_grpc_metrics
+            libraries.opencensus.contrib.grpc.metrics
 
-    implementation (libraries.google_auth_oauth2_http) {
+    implementation (libraries.google.auth.oauth2Http) {
         exclude group: 'org.apache.httpcomponents'
     }
 
     implementation (project(':grpc-services')) {
         exclude group: 'com.google.protobuf'
     }
 
-    compileOnly libraries.javax_annotation
+    compileOnly libraries.javax.annotation
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.3',
             'androidx.test:runner:1.4.0'

android/build.gradle

@@ -33,7 +33,7 @@ dependencies {
     api project(':grpc-core')
     implementation libraries.guava
     testImplementation project('::grpc-okhttp')
-    testImplementation libraries.androidx_test
+    testImplementation libraries.androidx.test.core
     testImplementation libraries.junit
     testImplementation (libraries.robolectric) {
         // Unreleased change: https://github.com/robolectric/robolectric/pull/5432

api/build.gradle

@@ -13,13 +13,13 @@ evaluationDependsOn(project(':grpc-context').path)
 dependencies {
     api project(':grpc-context'),
             libraries.jsr305,
-            libraries.errorprone
+            libraries.errorprone.annotations
     implementation libraries.guava
 
     testImplementation project(':grpc-context').sourceSets.test.output,
             project(':grpc-testing'),
             project(':grpc-grpclb')
-    testImplementation (libraries.guava_testlib) {
+    testImplementation (libraries.guava.testlib) {
         exclude group: 'junit', module: 'junit'
     }
     jmh project(':grpc-core')

auth/build.gradle

@@ -9,10 +9,10 @@ plugins {
 description = "gRPC: Auth"
 dependencies {
     api project(':grpc-api'),
-            libraries.google_auth_credentials
+            libraries.google.auth.credentials
     implementation libraries.guava
     testImplementation project(':grpc-testing'),
-            libraries.google_auth_oauth2_http
+            libraries.google.auth.oauth2Http
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
     signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }

authz/build.gradle

@@ -13,12 +13,12 @@ dependencies {
     implementation project(':grpc-protobuf'),
             project(':grpc-core')
 
-    annotationProcessor libraries.autovalue
-    compileOnly libraries.javax_annotation
+    annotationProcessor libraries.auto.value
+    compileOnly libraries.javax.annotation
 
     testImplementation project(':grpc-testing'),
             project(':grpc-testing-proto')
-    testImplementation (libraries.guava_testlib) {
+    testImplementation (libraries.guava.testlib) {
         exclude group: 'junit', module: 'junit'
     }
 

benchmarks/build.gradle

@@ -29,14 +29,18 @@ dependencies {
             project(':grpc-testing'),
             project(path: ':grpc-xds', configuration: 'shadow'),
             libraries.hdrhistogram,
-            libraries.netty_tcnative,
-            libraries.netty_epoll,
-            libraries.math
-    compileOnly libraries.javax_annotation
-    alpnagent libraries.jetty_alpn_agent
+            libraries.netty.tcnative,
+            libraries.commons.math3
+    implementation (libraries.netty.transport.epoll) {
+        artifact {
+            classifier = "linux-x86_64"
+        }
+    }
+    compileOnly libraries.javax.annotation
+    alpnagent libraries.jetty.alpn.agent
 
     testImplementation libraries.junit,
-            libraries.mockito
+            libraries.mockito.core
 }
 
 import net.ltgt.gradle.errorprone.CheckSeverity

binder/build.gradle

@@ -47,38 +47,38 @@ repositories {
 dependencies {
     api project(':grpc-core')
 
-    implementation libraries.androidx_annotation
-    implementation libraries.androidx_core
-    implementation libraries.androidx_lifecycle_common
+    implementation libraries.androidx.annotation
+    implementation libraries.androidx.core
+    implementation libraries.androidx.lifecycle.common
     implementation libraries.guava
-    testImplementation libraries.androidx_core
-    testImplementation libraries.androidx_test
-    testImplementation libraries.androidx_lifecycle_common
-    testImplementation libraries.androidx_lifecycle_service
+    testImplementation libraries.androidx.core
+    testImplementation libraries.androidx.test.core
+    testImplementation libraries.androidx.lifecycle.common
+    testImplementation libraries.androidx.lifecycle.service
     testImplementation libraries.junit
-    testImplementation libraries.mockito
+    testImplementation libraries.mockito.core
     testImplementation (libraries.robolectric) {
         // Unreleased change: https://github.com/robolectric/robolectric/pull/5432
         exclude group: 'com.google.auto.service', module: 'auto-service'
     }
-    testImplementation (libraries.guava_testlib) {
+    testImplementation (libraries.guava.testlib) {
         exclude group: 'junit', module: 'junit'
     }
     testImplementation libraries.truth
 
-    androidTestAnnotationProcessor libraries.autovalue
+    androidTestAnnotationProcessor libraries.auto.value
     androidTestImplementation project(':grpc-testing')
     androidTestImplementation project(':grpc-protobuf-lite')
-    androidTestImplementation libraries.autovalue_annotation
+    androidTestImplementation libraries.auto.value.annotations
     androidTestImplementation libraries.junit
-    androidTestImplementation libraries.androidx_core
-    androidTestImplementation libraries.androidx_test
-    androidTestImplementation libraries.androidx_test_rules
-    androidTestImplementation libraries.androidx_test_ext_junit
+    androidTestImplementation libraries.androidx.core
+    androidTestImplementation libraries.androidx.test.core
+    androidTestImplementation libraries.androidx.test.rules
+    androidTestImplementation libraries.androidx.test.ext.junit
     androidTestImplementation libraries.truth
-    androidTestImplementation libraries.mockito_android
-    androidTestImplementation libraries.androidx_lifecycle_service
-    androidTestImplementation (libraries.guava_testlib) {
+    androidTestImplementation libraries.mockito.android
+    androidTestImplementation libraries.androidx.lifecycle.service
+    androidTestImplementation (libraries.guava.testlib) {
         exclude group: 'junit', module: 'junit'
     }
 }

build.gradle

@@ -55,22 +55,14 @@ subprojects {
         protocPluginBaseName = 'protoc-gen-grpc-java'
         javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"
 
-        nettyVersion = '4.1.72.Final'
-        guavaVersion = '31.1-android'
-        googleauthVersion = '1.4.0'
-        protobufVersion = '3.19.2'
-        protocVersion = protobufVersion
-        opencensusVersion = '0.31.0'
-        autovalueVersion = '1.9'
-
         configureProtoCompilation = {
             String generatedSourcePath = "${projectDir}/src/generated"
             project.protobuf {
                 protoc {
                     if (project.hasProperty('protoc')) {
                         path = project.protoc
                     } else {
-                        artifact = "com.google.protobuf:protoc:${protocVersion}"
+                        artifact = libs.protobuf.protoc.get()
                     }
                 }
                 generateProtoTasks {
@@ -146,72 +138,7 @@ subprojects {
             }
         }
 
-        libraries = [
-            android_annotations: "com.google.android:annotations:4.1.1.4",
-            animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.19",
-            autovalue: "com.google.auto.value:auto-value:${autovalueVersion}",
-            autovalue_annotation: "com.google.auto.value:auto-value-annotations:${autovalueVersion}",
-            errorprone: "com.google.errorprone:error_prone_annotations:2.11.0",
-            cronet_api: 'org.chromium.net:cronet-api:92.4515.131',
-            cronet_embedded: 'org.chromium.net:cronet-embedded:92.4515.131',
-            gson: "com.google.code.gson:gson:2.9.0",
-            guava: "com.google.guava:guava:${guavaVersion}",
-            javax_annotation: 'org.apache.tomcat:annotations-api:6.0.53',
-            jsr305: 'com.google.code.findbugs:jsr305:3.0.2',
-            google_api_protos: 'com.google.api.grpc:proto-google-common-protos:2.0.1',
-            google_auth_credentials: "com.google.auth:google-auth-library-credentials:${googleauthVersion}",
-            google_auth_oauth2_http: "com.google.auth:google-auth-library-oauth2-http:${googleauthVersion}",
-            okhttp: 'com.squareup.okhttp:okhttp:2.7.4',
-            okio: 'com.squareup.okio:okio:1.17.5',
-            opencensus_api: "io.opencensus:opencensus-api:${opencensusVersion}",
-            opencensus_contrib_grpc_metrics: "io.opencensus:opencensus-contrib-grpc-metrics:${opencensusVersion}",
-            opencensus_impl: "io.opencensus:opencensus-impl:${opencensusVersion}",
-            opencensus_impl_lite: "io.opencensus:opencensus-impl-lite:${opencensusVersion}",
-            opencensus_proto: "io.opencensus:opencensus-proto:0.2.0",
-            instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
-            perfmark: 'io.perfmark:perfmark-api:0.25.0',
-            protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
-            protobuf_lite: "com.google.protobuf:protobuf-javalite:${protobufVersion}",
-            protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}",
-
-            netty: "io.netty:netty-codec-http2:[${nettyVersion}]",
-            netty_epoll: "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64",
-            netty_epoll_common: "io.netty:netty-transport-native-epoll:${nettyVersion}",
-            netty_unix_common: "io.netty:netty-transport-native-unix-common:${nettyVersion}",
-            netty_epoll_arm64: "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-aarch_64",
-            netty_proxy_handler: "io.netty:netty-handler-proxy:${nettyVersion}",
-
-            // Keep the following references of tcnative version in sync whenever it's updated
-            // SECURITY.md (multiple occurrences)
-            // examples/example-tls/build.gradle
-            // examples/example-tls/pom.xml
-            netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.46.Final',
-
-            conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.5.1',
-            re2j: 'com.google.re2j:re2j:1.5',
-
-            // Test dependencies.
-            junit: 'junit:junit:4.12',
-            mockito: 'org.mockito:mockito-core:3.3.3',
-            mockito_android: 'org.mockito:mockito-android:3.8.0',
-            truth: 'com.google.truth:truth:1.0.1',
-            guava_testlib: "com.google.guava:guava-testlib:${guavaVersion}",
-            androidx_annotation: "androidx.annotation:annotation:1.1.0",
-            androidx_core: "androidx.core:core:1.3.0",
-            androidx_lifecycle_common: "androidx.lifecycle:lifecycle-common:2.3.0",
-            androidx_lifecycle_service: "androidx.lifecycle:lifecycle-service:2.3.0",
-            androidx_test: "androidx.test:core:1.3.0",
-            androidx_test_rules: "androidx.test:rules:1.3.0",
-            androidx_test_ext_junit: "androidx.test.ext:junit:1.1.2",
-            robolectric: "org.robolectric:robolectric:4.4",
-
-            // Benchmark dependencies
-            hdrhistogram: 'org.hdrhistogram:HdrHistogram:2.1.12',
-            math: 'org.apache.commons:commons-math3:3.6.1',
-
-            // Jetty ALPN dependencies
-            jetty_alpn_agent: 'org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.10'
-        ]
+        libraries = libs
 
         appendToProperty = { Property<String> property, String value, String separator ->
             if (property.present) {
@@ -233,7 +160,7 @@ subprojects {
 
     checkstyle {
         configDirectory = file("$rootDir/buildscripts")
-        toolVersion = "6.17"
+        toolVersion = libs.versions.checkstyle.get()
         ignoreFailures = false
         if (rootProject.hasProperty("checkstyle.ignoreFailures")) {
             ignoreFailures = rootProject.properties["checkstyle.ignoreFailures"].toBoolean()
@@ -242,8 +169,8 @@ subprojects {
 
     if (!project.hasProperty('errorProne') || errorProne.toBoolean()) {
         dependencies {
-            errorprone 'com.google.errorprone:error_prone_core:2.10.0'
-            errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
+            errorprone libs.errorprone.core
+            errorproneJavac libs.errorprone.javac
         }
     } else {
         // Disable Error Prone
@@ -258,7 +185,7 @@ subprojects {
 
         dependencies {
             testImplementation libraries.junit,
-                    libraries.mockito,
+                    libraries.mockito.core,
                     libraries.truth
         }
 
@@ -303,7 +230,7 @@ subprojects {
 
         if (!project.hasProperty('errorProne') || errorProne.toBoolean()) {
             dependencies {
-                annotationProcessor 'com.google.guava:guava-beta-checker:1.0'
+                annotationProcessor libs.guava.betaChecker
             }
         }
 
@@ -327,8 +254,7 @@ subprojects {
         plugins.withId("ru.vyarus.animalsniffer") {
 	    // Only available after java plugin has loaded
             animalsniffer {
-                // Breaks on upgrade: https://github.com/mojohaus/animal-sniffer/issues/131
-                toolVersion = '1.18'
+                toolVersion = libs.versions.animalsniffer.get()
             }
         }
     }
@@ -369,6 +295,24 @@ subprojects {
         }
     }
 
+    plugins.withId("com.github.johnrengelman.shadow") {
+        tasks.named("shadowJar") {
+            // Do a dance to remove Class-Path. This needs to run after the doFirst() from the
+            // shadow plugin that adds Class-Path and before the core jar action. Using doFirst will
+            // have this run before the shadow plugin, and doLast will run after the core jar
+            // action. See #8606.
+            // The shadow plugin adds another doFirst when application is used for setting
+            // Main-Class. Ordering with it doesn't matter.
+            actions.add(plugins.hasPlugin("application") ? 2 : 1, new Action<Task>() {
+                @Override public void execute(Task task) {
+                    if (!task.manifest.attributes.remove("Class-Path")) {
+                        throw new AssertionError("Did not find Class-Path to remove from manifest")
+                    }
+                }
+            })
+        }
+    }
+
     plugins.withId("maven-publish") {
         publishing {
             publications {

census/build.gradle

@@ -10,14 +10,14 @@ evaluationDependsOn(project(':grpc-api').path)
 dependencies {
     api project(':grpc-api')
     implementation libraries.guava,
-            libraries.opencensus_api,
-            libraries.opencensus_contrib_grpc_metrics
+            libraries.opencensus.api,
+            libraries.opencensus.contrib.grpc.metrics
 
     testImplementation project(':grpc-api').sourceSets.test.output,
             project(':grpc-context').sourceSets.test.output,
             project(':grpc-core').sourceSets.test.output,
             project(':grpc-testing'),
-            libraries.opencensus_impl
+            libraries.opencensus.impl
 }
 
 javadoc {