upgrade cel

Author: shivaspeaks

MODULE.bazel

@@ -21,10 +21,8 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.re2j:re2j:1.8",
     "com.google.s2a.proto.v2:s2a-proto:0.1.3",
     "com.google.truth:truth:1.4.5",
-    "dev.cel:runtime:0.11.1",
-    "dev.cel:compiler:0.11.1",
-    "dev.cel:protobuf:0.11.1",
-    "org.antlr:antlr4-runtime:4.9.1",
+    "dev.cel:runtime:0.12.0",
+    "dev.cel:protobuf:0.12.0",
     "com.squareup.okhttp:okhttp:2.7.5",
     "com.squareup.okio:okio:2.10.0",  # 3.0+ needs swapping to -jvm; need work to avoid flag-day
     "io.netty:netty-buffer:4.1.130.Final",

build.gradle

@@ -43,6 +43,7 @@ subprojects {
                 ignoreGradleMetadataRedirection()
             }
         }
+        maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
     }
 
     tasks.withType(JavaCompile).configureEach {

gradle/libs.versions.toml

@@ -34,9 +34,9 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1"
 # checkstyle 10.0+ requires Java 11+
 # See https://checkstyle.sourceforge.io/releasenotes_old_8-35_10-26.html#Release_10.0
 # checkForUpdates: checkstylejava8:9.+
-cel-runtime = "dev.cel:runtime:0.11.1"
-cel-protobuf = "dev.cel:protobuf:0.11.1"
-cel-compiler = "dev.cel:compiler:0.11.1"
+cel-runtime = "dev.cel:runtime:0.12.0"
+cel-protobuf = "dev.cel:protobuf:0.12.0"
+cel-compiler = "dev.cel:compiler:0.12.0"
 checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
 commons-math3 = "org.apache.commons:commons-math3:3.6.1"
 conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"

repositories.bzl

@@ -25,10 +25,8 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.re2j:re2j:1.8",
     "com.google.s2a.proto.v2:s2a-proto:0.1.3",
     "com.google.truth:truth:1.4.5",
-    "dev.cel:runtime:0.11.1",
-    "dev.cel:compiler:0.11.1",
-    "dev.cel:protobuf:0.11.1",
-    "org.antlr:antlr4-runtime:4.9.1",
+    "dev.cel:runtime:0.12.0",
+    "dev.cel:protobuf:0.12.0",
     "com.squareup.okhttp:okhttp:2.7.5",
     "com.squareup.okio:okio:2.10.0",  # 3.0+ needs swapping to -jvm; need work to avoid flag-day
     "io.netty:netty-buffer:4.1.130.Final",

xds/BUILD.bazel

@@ -43,7 +43,6 @@ java_library(
         artifact("com.google.re2j:re2j"),
         artifact("dev.cel:runtime"),
         artifact("dev.cel:protobuf"),
-        artifact("org.antlr:antlr4-runtime"),
         artifact("io.netty:netty-buffer"),
         artifact("io.netty:netty-codec"),
         artifact("io.netty:netty-common"),

xds/build.gradle

@@ -62,7 +62,6 @@ dependencies {
     implementation(libraries.cel.protobuf) {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }
-    implementation "org.antlr:antlr4-runtime:4.9.1"
     def nettyDependency = implementation project(':grpc-netty')
 
     testImplementation project(':grpc-api')

xds/src/main/java/io/grpc/xds/internal/matcher/CelCommon.java

@@ -43,9 +43,8 @@ final class CelCommon {
               return false;
             }
             if (func == StandardFunction.ADD) {
-              // TODO: fix this, remove (object) casting when we upgrade to 0.12.0
-              return !over.equals((Object) AddOverload.ADD_STRING)
-                  && !over.equals((Object) AddOverload.ADD_LIST);
+              return !over.equals(AddOverload.ADD_STRING)
+                  && !over.equals(AddOverload.ADD_LIST);
             }
             return true;
           })