From c6b49725406fbfff1f519dc5fa634fce7f28e45e Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Wed, 8 Jan 2025 12:54:07 -0800 Subject: [PATCH 1/3] experiment: using proto3 version of dev.cel --- gradle/libs.versions.toml | 4 +++- xds/build.gradle | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43ec3368b76..19215de47b5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,11 +27,13 @@ commons-math3 = "org.apache.commons:commons-math3:3.6.1" conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" cronet-api = "org.chromium.net:cronet-api: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.0-proto3" # error-prone 2.31.0+ blocked on https://github.com/grpc/grpc-java/issues/10152 # It breaks Bazel (ArrayIndexOutOfBoundsException in turbine) and Dexing ("D8: # java.lang.NullPointerException"). We can trivially upgrade the Bazel CI to # 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+ errorprone-core = "com.google.errorprone:error_prone_core:2.31.0" google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.48.0" diff --git a/xds/build.gradle b/xds/build.gradle index c51fc2819d7..360e7f38604 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -53,6 +53,7 @@ dependencies { project(':grpc-auth'), project(path: ':grpc-alts', configuration: 'shadow'), libraries.guava, + libraries.dev.cel.runtime, libraries.gson, libraries.re2j, libraries.auto.value.annotations, From 0fa6a1d895e450b96bacbf6c61a4ce9b306edfff Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Wed, 8 Jan 2025 15:16:22 -0800 Subject: [PATCH 2/3] bump error_prone_annotations to 2.36.0 in bazel as well --- MODULE.bazel | 2 +- repositories.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4c7e1b3dca5..390b84f9393 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -15,7 +15,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", "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:guava:33.3.1-android", "com.google.re2j:re2j:1.7", diff --git a/repositories.bzl b/repositories.bzl index 7d01675e9ad..1fa1db5685e 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -19,7 +19,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", "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:guava:33.3.1-android", "com.google.re2j:re2j:1.7", From 884a3ce7a5d7f73c7f120f8e2780c8741a0e6273 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Fri, 17 Jan 2025 12:09:19 -0800 Subject: [PATCH 3/3] use dev-cel-protobuf 0.9.1-proto3 --- gradle/libs.versions.toml | 3 ++- xds/build.gradle | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 19215de47b5..123e4cd59ec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,8 @@ conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" cronet-api = "org.chromium.net:cronet-api: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.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 # It breaks Bazel (ArrayIndexOutOfBoundsException in turbine) and Dexing ("D8: # java.lang.NullPointerException"). We can trivially upgrade the Bazel CI to diff --git a/xds/build.gradle b/xds/build.gradle index 360e7f38604..3cc10b01b50 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -54,6 +54,7 @@ dependencies { project(path: ':grpc-alts', configuration: 'shadow'), libraries.guava, libraries.dev.cel.runtime, + libraries.dev.cel.protobuf, libraries.gson, libraries.re2j, libraries.auto.value.annotations,