flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove direct dependency on j2objc 

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.
This commit is contained in:
Eric Anderson 2024-08-13 21:33:55 -07:00 committed by GitHub
parent 909c4bc382
commit ff8e413760
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alts/BUILD.bazel
View File

@ -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"),

1
api/BUILD.bazel
View File

@ -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"),
],
)

1
auth/BUILD.bazel
View File

@ -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"),
],
)

1
core/BUILD.bazel
View File

@ -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"),
],

5
examples/pom.xml
View File

@ -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>

3
gcp-observability/build.gradle
View File

@ -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'),

1
gradle/libs.versions.toml
View File

@ -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"

1
grpclb/BUILD.bazel
View File

@ -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"),
],
)

4
grpclb/build.gradle
View File

@ -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,

1
inprocess/BUILD.bazel
View File

@ -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"),
],
)

1
netty/BUILD.bazel
View File

@ -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"),

1
okhttp/BUILD.bazel
View File

@ -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"),

1
protobuf-lite/BUILD.bazel
View File

@ -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"],

1
protobuf/BUILD.bazel
View File

@ -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"),
],
)

5
services/build.gradle
View File

@ -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'),

1
stub/BUILD.bazel
View File

@ -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"),
],
)

1
testing/BUILD.bazel
View File

@ -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"),
],

1
util/BUILD.bazel
View File

@ -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"),
],
)

1
xds/build.gradle
View File

@ -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,