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

Merge 884a3ce7a5 into c4256add4d

This commit is contained in:
Sergii Tkachenko 2025-07-24 08:56:19 +08:00 committed by GitHub
parent c4256add4d 884a3ce7a5
commit 378c0f604e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MODULE.bazel
View File

@ -15,7 +15,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
"com.google.auto.value:auto-value:1.11.0", "com.google.auto.value:auto-value:1.11.0",
"com.google.code.findbugs:jsr305:3.0.2", "com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.11.0", "com.google.code.gson:gson:2.11.0",
"com.google.errorprone:error_prone_annotations:2.30.0", "com.google.errorprone:error_prone_annotations:2.36.0",
"com.google.guava:failureaccess:1.0.1", "com.google.guava:failureaccess:1.0.1",
"com.google.guava:guava:33.3.1-android", "com.google.guava:guava:33.3.1-android",
"com.google.re2j:re2j:1.8", "com.google.re2j:re2j:1.8",

5
gradle/libs.versions.toml
View File

@ -29,11 +29,14 @@ commons-math3 = "org.apache.commons:commons-math3:3.6.1"
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
cronet-api = "org.chromium.net:cronet-api:119.6045.31" cronet-api = "org.chromium.net:cronet-api:119.6045.31"
cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31" cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
#dev-cel-compiler = "dev.cel:compiler:0.9.0-proto3"
dev-cel-runtime = "dev.cel:runtime:0.9.1-proto3"
dev-cel-protobuf = "dev.cel:runtime:0.9.1-proto3"
# error-prone 2.31.0+ blocked on https://github.com/grpc/grpc-java/issues/10152 # error-prone 2.31.0+ blocked on https://github.com/grpc/grpc-java/issues/10152
# It breaks Bazel (ArrayIndexOutOfBoundsException in turbine) and Dexing ("D8: # It breaks Bazel (ArrayIndexOutOfBoundsException in turbine) and Dexing ("D8:
# java.lang.NullPointerException"). We can trivially upgrade the Bazel CI to # java.lang.NullPointerException"). We can trivially upgrade the Bazel CI to
# 6.3.0+ (https://github.com/bazelbuild/bazel/issues/18743). # 6.3.0+ (https://github.com/bazelbuild/bazel/issues/18743).
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.30.0" errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.36.0"
# error-prone 2.32.0+ require Java 17+ # error-prone 2.32.0+ require Java 17+
errorprone-core = "com.google.errorprone:error_prone_core:2.31.0" errorprone-core = "com.google.errorprone:error_prone_core:2.31.0"
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.51.0" google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.51.0"

2
repositories.bzl
View File

@ -19,7 +19,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
"com.google.auto.value:auto-value:1.11.0", "com.google.auto.value:auto-value:1.11.0",
"com.google.code.findbugs:jsr305:3.0.2", "com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.11.0", "com.google.code.gson:gson:2.11.0",
"com.google.errorprone:error_prone_annotations:2.30.0", "com.google.errorprone:error_prone_annotations:2.36.0",
"com.google.guava:failureaccess:1.0.1", "com.google.guava:failureaccess:1.0.1",
"com.google.guava:guava:33.3.1-android", "com.google.guava:guava:33.3.1-android",
"com.google.re2j:re2j:1.8", "com.google.re2j:re2j:1.8",

2
xds/build.gradle
View File

@ -54,6 +54,8 @@ dependencies {
project(':grpc-auth'), project(':grpc-auth'),
project(path: ':grpc-alts', configuration: 'shadow'), project(path: ':grpc-alts', configuration: 'shadow'),
libraries.guava, libraries.guava,
libraries.dev.cel.runtime,
libraries.dev.cel.protobuf,
libraries.gson, libraries.gson,
libraries.re2j, libraries.re2j,
libraries.auto.value.annotations, libraries.auto.value.annotations,