Skip to content

Commit b2924d7

Browse files
committed
Upgrade error_prone_annotations version to 2.36.0
1 parent b47d84b commit b2924d7

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1515
"com.google.auto.value:auto-value:1.11.0",
1616
"com.google.code.findbugs:jsr305:3.0.2",
1717
"com.google.code.gson:gson:2.11.0",
18-
"com.google.errorprone:error_prone_annotations:2.30.0",
18+
"com.google.errorprone:error_prone_annotations:2.36.0",
1919
"com.google.guava:failureaccess:1.0.1",
2020
"com.google.guava:guava:33.4.8-jre",
2121
"com.google.re2j:re2j:1.8",

gradle/libs.versions.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ commons-math3 = "org.apache.commons:commons-math3:3.6.1"
2929
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
3030
cronet-api = "org.chromium.net:cronet-api:119.6045.31"
3131
cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
32-
# error-prone 2.31.0+ blocked on https://github.com/grpc/grpc-java/issues/10152
33-
# It breaks Bazel (ArrayIndexOutOfBoundsException in turbine) and Dexing ("D8:
34-
# java.lang.NullPointerException"). We can trivially upgrade the Bazel CI to
35-
# 6.3.0+ (https://github.com/bazelbuild/bazel/issues/18743).
36-
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.30.0"
32+
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.36.0"
3733
# error-prone 2.32.0+ require Java 17+
3834
errorprone-core = "com.google.errorprone:error_prone_core:2.31.0"
3935
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.51.0"
@@ -45,7 +41,7 @@ google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.24.1
4541
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.21.2"
4642
# 2.12.1 requires error_prone_annotations:2.36.0 but we are stuck with 2.30.0
4743
gson = "com.google.code.gson:gson:2.11.0"
48-
# 33.4.0 requires com.google.errorprone:error_prone_annotations:2.36.0 but we are stuck with 2.30.0 (see above)
44+
# 33.4.8-jre requires com.google.errorprone:error_prone_annotations:2.36.0
4945
guava = "com.google.guava:guava:33.4.8-jre"
5046
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
5147
guava-testlib = "com.google.guava:guava-testlib:33.4.8-jre"

repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1919
"com.google.auto.value:auto-value:1.11.0",
2020
"com.google.code.findbugs:jsr305:3.0.2",
2121
"com.google.code.gson:gson:2.11.0",
22-
"com.google.errorprone:error_prone_annotations:2.30.0",
22+
"com.google.errorprone:error_prone_annotations:2.36.0",
2323
"com.google.guava:failureaccess:1.0.1",
2424
"com.google.guava:guava:33.4.8-jre",
2525
"com.google.re2j:re2j:1.8",

0 commit comments

Comments
 (0)