Remove direct dependency on j2objc

ejona86 · web-flow · commit ff8e4137603b · 2024-08-13T21:33:55.000-07:00
Bazel had the dependency added because of #5046, where Guava was depending on it as compile-only and Bazel build have "unknown enum constant" warnings. Guava now has a compile dependency on j2objc, so this workaround is no longer needed. There are currently no version skew issues in Gradle, which was the only usage.
diff --git a/alts/BUILD.bazel b/alts/BUILD.bazel
@@ -19,7 +19,6 @@ java_library(
         "@com_google_protobuf//:protobuf_java_util",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("io.netty:netty-buffer"),
         artifact("io.netty:netty-codec"),
         artifact("io.netty:netty-common"),
@@ -45,7 +44,6 @@ java_library(
         artifact("com.google.auth:google-auth-library-oauth2-http"),
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("io.netty:netty-common"),
         artifact("io.netty:netty-handler"),
         artifact("io.netty:netty-transport"),
diff --git a/api/BUILD.bazel b/api/BUILD.bazel
@@ -13,6 +13,5 @@ java_library(
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:failureaccess"),  # future transitive dep of Guava. See #5214
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
     ],
 )
diff --git a/auth/BUILD.bazel b/auth/BUILD.bazel
@@ -11,6 +11,5 @@ java_library(
         artifact("com.google.auth:google-auth-library-credentials"),
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
     ],
 )
diff --git a/core/BUILD.bazel b/core/BUILD.bazel
@@ -30,7 +30,6 @@ java_library(
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("io.perfmark:perfmark-api"),
         artifact("org.codehaus.mojo:animal-sniffer-annotations"),
     ],
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -55,6 +55,11 @@
       <artifactId>protobuf-java-util</artifactId>
       <version>${protobuf.version}</version>
     </dependency>
+    <dependency> <!-- Use newer version than in protobuf-java-util -->
+      <groupId>com.google.j2objc</groupId>
+      <artifactId>j2objc-annotations</artifactId>
+      <version>3.0.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>annotations-api</artifactId>
diff --git a/gcp-observability/build.gradle b/gcp-observability/build.gradle
@@ -65,8 +65,7 @@ dependencies {
             libraries.auto.value.annotations, // Use our newer version
             libraries.guava.jre, // Use our newer version
             libraries.protobuf.java.util, // Use our newer version
-            libraries.re2j, // Use our newer version
-            libraries.j2objc.annotations // Explicit dependency to keep in step with version used by guava
+            libraries.re2j // Use our newer version
 
     testImplementation testFixtures(project(':grpc-api')),
             project(':grpc-testing'),
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -42,7 +42,6 @@ guava-testlib = "com.google.guava:guava-testlib:33.2.1-android"
 # May be different from the -android version.
 guava-jre = "com.google.guava:guava:33.2.1-jre"
 hdrhistogram = "org.hdrhistogram:HdrHistogram:2.2.2"
-j2objc-annotations = " com.google.j2objc:j2objc-annotations:3.0.0"
 jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:5.0.0"
 javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
 javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
diff --git a/grpclb/BUILD.bazel b/grpclb/BUILD.bazel
@@ -21,7 +21,6 @@ java_library(
         "@io_grpc_grpc_proto//:grpclb_load_balancer_java_proto",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
     ],
 )
 
diff --git a/grpclb/build.gradle b/grpclb/build.gradle
@@ -19,9 +19,9 @@ dependencies {
     implementation project(':grpc-core'),
             project(':grpc-protobuf'),
             project(':grpc-stub'),
+            libraries.guava,
             libraries.protobuf.java,
-            libraries.protobuf.java.util,
-            libraries.guava
+            libraries.protobuf.java.util
     runtimeOnly libraries.errorprone.annotations
     compileOnly libraries.javax.annotation
     testImplementation libraries.truth,
diff --git a/inprocess/BUILD.bazel b/inprocess/BUILD.bazel
@@ -13,6 +13,5 @@ java_library(
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
     ],
 )
diff --git a/netty/BUILD.bazel b/netty/BUILD.bazel
@@ -15,7 +15,6 @@ java_library(
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("io.netty:netty-buffer"),
         artifact("io.netty:netty-codec"),
         artifact("io.netty:netty-codec-http"),
diff --git a/okhttp/BUILD.bazel b/okhttp/BUILD.bazel
@@ -17,7 +17,6 @@ java_library(
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("com.squareup.okhttp:okhttp"),
         artifact("com.squareup.okio:okio"),
         artifact("io.perfmark:perfmark-api"),
diff --git a/protobuf-lite/BUILD.bazel b/protobuf-lite/BUILD.bazel
@@ -10,7 +10,6 @@ java_library(
         "//api",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
     ] + select({
         ":android": ["@com_google_protobuf//:protobuf_javalite"],
         "//conditions:default": ["@com_google_protobuf//:protobuf_java"],
diff --git a/protobuf/BUILD.bazel b/protobuf/BUILD.bazel
@@ -13,6 +13,5 @@ java_library(
         artifact("com.google.api.grpc:proto-google-common-protos"),
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
     ],
 )
diff --git a/services/build.gradle b/services/build.gradle
@@ -27,11 +27,10 @@ dependencies {
     implementation project(':grpc-core'),
             project(':grpc-protobuf'),
             project(':grpc-util'),
-            libraries.protobuf.java.util,
-            libraries.guava.jre // JRE required by protobuf-java-util
+            libraries.guava.jre, // JRE required by protobuf-java-util
+            libraries.protobuf.java.util
 
     runtimeOnly libraries.errorprone.annotations,
-            libraries.j2objc.annotations, // Explicit dependency to keep in step with version used by guava
             libraries.gson  // to fix checkUpperBoundDeps error here
     compileOnly libraries.javax.annotation
     testImplementation project(':grpc-testing'),
diff --git a/stub/BUILD.bazel b/stub/BUILD.bazel
@@ -12,7 +12,6 @@ java_library(
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
     ],
 )
 
diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
@@ -18,7 +18,6 @@ java_library(
         "//util",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("com.google.truth:truth"),
         artifact("junit:junit"),
     ],
diff --git a/util/BUILD.bazel b/util/BUILD.bazel
@@ -15,7 +15,6 @@ java_library(
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("org.codehaus.mojo:animal-sniffer-annotations"),
     ],
 )
diff --git a/xds/build.gradle b/xds/build.gradle
@@ -52,6 +52,7 @@ dependencies {
             project(':grpc-services'),
             project(':grpc-auth'),
             project(path: ':grpc-alts', configuration: 'shadow'),
+            libraries.guava,
             libraries.gson,
             libraries.re2j,
             libraries.auto.value.annotations,

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,5 @@ java_library(`
`13`	`13`	`artifact("com.google.errorprone:error_prone_annotations"),`
`14`	`14`	`artifact("com.google.guava:failureaccess"), # future transitive dep of Guava. See #5214`
`15`	`15`	`artifact("com.google.guava:guava"),`
`16`		`- artifact("com.google.j2objc:j2objc-annotations"),`
`17`	`16`	`],`
`18`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,5 @@ java_library(`
`11`	`11`	`artifact("com.google.auth:google-auth-library-credentials"),`
`12`	`12`	`artifact("com.google.code.findbugs:jsr305"),`
`13`	`13`	`artifact("com.google.guava:guava"),`
`14`		`- artifact("com.google.j2objc:j2objc-annotations"),`
`15`	`14`	`],`
`16`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ java_library(`
`21`	`21`	`"@io_grpc_grpc_proto//:grpclb_load_balancer_java_proto",`
`22`	`22`	`artifact("com.google.code.findbugs:jsr305"),`
`23`	`23`	`artifact("com.google.guava:guava"),`
`24`		`- artifact("com.google.j2objc:j2objc-annotations"),`
`25`	`24`	`],`
`26`	`25`	`)`
`27`	`26`