Main

.bazelrc

@@ -1,7 +1,13 @@
 common --enable_bzlmod
 # Use built-in protoc
-common --incompatible_enable_proto_toolchain_resolution --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc
+common --incompatible_enable_proto_toolchain_resolution
+common --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc=true
 
+# Ensure that we don't accidentally build protobuf or gRPC
+common --per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --host_per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --per_file_copt=external/.*grpc.*@--GRPC_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --host_per_file_copt=external/.*grpc.*@--GRPC_WAS_NOT_SUPPOSED_TO_BE_BUILT
 build --java_runtime_version=remotejdk_11
 build --java_language_version=11
 
@@ -10,5 +16,8 @@ build --java_language_version=11
 common --javacopt=-Xlint:-options
 
 # Remove flag once https://github.com/google/cel-spec/issues/508 and rules_jvm_external is fixed.
-common --incompatible_autoload_externally=proto_library,cc_proto_library,java_proto_library,java_test
+common --incompatible_autoload_externally=proto_library,cc_proto_library,java_proto_library,java_test,java_import
+
+# Limit repository cache size by not caching extracted repository contents
+build --repo_contents_cache=
 

.github/workflows/cross_artifact_dependencies_check.sh

@@ -22,6 +22,7 @@ TARGETS=(
   "//publish:cel_runtime"
   "//publish:cel_protobuf"
   "//publish:cel_v1alpha1"
+  "//publish:cel_verifier"
 )
 
 echo "------------------------------------------------"

.github/workflows/unwanted_deps.sh

@@ -46,4 +46,8 @@ checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf
 # cel_runtime_android shouldn't depend on the full protobuf runtime or antlr
 checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
 checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:org_antlr_antlr4_runtime'
+
+# cel shouldn't depend on the verifier
+checkUnwantedDeps '//publish:cel' '//verifier/'
+
 exit 0

.github/workflows/workflow.yml

@@ -15,7 +15,7 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-  Static-Checks:
+  Bazel-Build-Java8:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -30,16 +30,21 @@ jobs:
             # Avoid downloading Bazel every time.
             bazelisk-cache: true
             # Store build cache per workflow.
-            disk-cache: ${{ github.workflow }}
+            disk-cache: ${{ github.workflow }}-${{ github.job }}
             # Share repository cache between workflows.
             repository-cache: true
-            # Never write to the cache, strictly read-only
-            cache-save: false
+            # Prevent PRs from polluting cache
+            cache-save: ${{ github.event_name != 'pull_request' }}
+      - name: Bazel Output Version
+        run: bazelisk --version
+      - name: Java 8 Build
+        run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
       - name: Unwanted Dependencies
         run: .github/workflows/unwanted_deps.sh
       - name: Cross-artifact Duplicate Classes Check
         run: .github/workflows/cross_artifact_dependencies_check.sh
       - run: echo "🍏 This job's status is ${{ job.status }}."
+
   Bazel-Tests:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -55,15 +60,13 @@ jobs:
             # Avoid downloading Bazel every time.
             bazelisk-cache: true
             # Store build cache per workflow.
-            disk-cache: ${{ github.workflow }}
+            disk-cache: ${{ github.workflow }}-${{ github.job }}
             # Share repository cache between workflows.
             repository-cache: true
             # Prevent PRs from polluting cache
             cache-save: ${{ github.event_name != 'pull_request' }}
       - name: Bazel Output Version
         run: bazelisk --version
-      - name: Java 8 Build
-        run: bazel build ... --java_language_version=8 --java_runtime_version=8 --build_tag_filters=-conformance_maven
       - name: Bazel Test
         # Exclude codelab exercises as they are intentionally made to fail
         # Exclude maven conformance tests. They are only executed when there's version change.
@@ -82,7 +85,7 @@ jobs:
         uses: actions/checkout@v6
       - name: Get changed files
         id: changed_file
-        uses: tj-actions/changed-files@v46
+        uses: tj-actions/changed-files@v47
         with:
           files: publish/cel_version.bzl
       - name: Setup Bazel
@@ -92,7 +95,7 @@ jobs:
             # Avoid downloading Bazel every time.
             bazelisk-cache: true
             # Store build cache per workflow.
-            disk-cache: ${{ github.workflow }}
+            disk-cache: ${{ github.workflow }}-${{ github.job }}
             # Share repository cache between workflows.
             repository-cache: true
             # Never write to the cache, strictly read-only
@@ -121,4 +124,6 @@ jobs:
       - name: Run Conformance Maven Test on Version Change
         if: steps.changed_file.outputs.any_changed == 'true'
         run: bazelisk test //conformance/src/test/java/dev/cel/conformance:conformance_maven --test_output=errors
-      - run: echo "🍏 This job's status is ${{ job.status }}."
+      - run: echo "🍏 This job's status is ${JOB_STATUS}."
+        env:
+          JOB_STATUS: ${{ job.status }}

BUILD.bazel

@@ -81,6 +81,7 @@ java_library(
     neverlink = 1,
     exports = [
         "@maven//:com_google_auto_value_auto_value_annotations",
+        "@maven//:org_jspecify_jspecify",
     ],
 )
 
@@ -95,6 +96,14 @@ java_library(
     ],
 )
 
+java_library(
+    name = "java_jline",
+    exports = [
+        "@maven//:org_jline_jline_reader",
+        "@maven//:org_jline_jline_terminal",
+    ],
+)
+
 default_java_toolchain(
     name = "repository_default_toolchain",
     configuration = DEFAULT_TOOLCHAIN_CONFIGURATION,

MODULE.bazel

@@ -16,32 +16,41 @@ module(
     name = "cel_java",
 )
 
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "rules_jvm_external", version = "6.9")
-bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")  # see https://github.com/bazelbuild/rules_android/issues/373
-bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
-bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "bazel_skylib", version = "1.9.2")
+bazel_dep(name = "rules_jvm_external", version = "7.1")
+bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf")  # see https://github.com/bazelbuild/rules_android/issues/373
+bazel_dep(name = "googleapis", version = "0.0.0-20260728-b8486a2f", repo_name = "com_google_googleapis")
+bazel_dep(name = "rules_pkg", version = "1.2.0")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
-bazel_dep(name = "rules_java", version = "9.3.0")
-bazel_dep(name = "rules_android", version = "0.7.1")
-bazel_dep(name = "rules_shell", version = "0.6.1")
-bazel_dep(name = "googleapis-java", version = "1.0.0")
-bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "cel_spec")
+bazel_dep(name = "rules_java", version = "9.7.0")
+bazel_dep(name = "rules_android", version = "0.7.3")
+bazel_dep(name = "rules_shell", version = "0.8.0")
+bazel_dep(name = "googleapis-java", version = "1.1.5")
+bazel_dep(name = "cel-spec", version = "0.25.2", repo_name = "cel_spec")
+bazel_dep(name = "rules_go", version = "0.62.0")
+
+# Required by cel-spec to satisfy gazelle transitive dependency
+go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
+go_sdk.download(version = "1.26.5")
 
 switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
 switched_rules.use_languages(java = True)
 use_repo(switched_rules, "com_google_googleapis_imports")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 
-GUAVA_VERSION = "33.5.0"
+AUTO_VALUE_VERSION = "1.11.1"
+
+GUAVA_VERSION = "33.6.0"
+
+JLINE_VERSION = "3.30.16"
 
-TRUTH_VERSION = "1.4.4"
+TRUTH_VERSION = "1.4.5"
 
-PROTOBUF_JAVA_VERSION = "4.33.5"
+PROTOBUF_JAVA_VERSION = "4.35.1"
 
-CEL_VERSION = "0.12.0-SNAPSHOT"
+CEL_VERSION = "0.14.0"
 
 # Compile only artifacts
 [
@@ -53,7 +62,7 @@ CEL_VERSION = "0.12.0-SNAPSHOT"
     )
     for group, artifact, version in [coord.split(":") for coord in [
         "com.google.code.findbugs:annotations:3.0.1",
-        "com.google.errorprone:error_prone_annotations:2.42.0",
+        "com.google.errorprone:error_prone_annotations:2.50.0",
     ]]
 ]
 
@@ -67,8 +76,8 @@ CEL_VERSION = "0.12.0-SNAPSHOT"
     )
     for group, artifact, version in [coord.split(":") for coord in [
         "org.mockito:mockito-core:4.11.0",
-        "io.github.classgraph:classgraph:4.8.179",
-        "com.google.testparameterinjector:test-parameter-injector:1.18",
+        "io.github.classgraph:classgraph:4.8.186",
+        "com.google.testparameterinjector:test-parameter-injector:1.22",
         "com.google.guava:guava-testlib:" + GUAVA_VERSION + "-jre",
         "com.google.truth.extensions:truth-java8-extension:" + TRUTH_VERSION,
         "com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION,
@@ -81,19 +90,23 @@ maven.install(
     name = "maven",
     # keep sorted
     artifacts = [
-        "com.google.auto.value:auto-value:1.11.0",
-        "com.google.auto.value:auto-value-annotations:1.11.0",
+        "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
+        "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
         "com.google.guava:guava:" + GUAVA_VERSION + "-jre",
         "com.google.protobuf:protobuf-java:" + PROTOBUF_JAVA_VERSION,
         "com.google.protobuf:protobuf-java-util:" + PROTOBUF_JAVA_VERSION,
         "com.google.re2j:re2j:1.8",
         "info.picocli:picocli:4.7.7",
         "org.antlr:antlr4-runtime:4.13.2",
         "org.freemarker:freemarker:2.3.34",
+        "org.jline:jline-reader:" + JLINE_VERSION,
+        "org.jline:jline-terminal:" + JLINE_VERSION,
         "org.jspecify:jspecify:1.0.0",
-        "org.threeten:threeten-extra:1.8.0",
-        "org.yaml:snakeyaml:2.5",
+        "org.threeten:threeten-extra:1.10.0",
+        "org.yaml:snakeyaml:2.6",
+        "tools.aqua:z3-turnkey:4.14.1",
     ],
+    known_contributing_modules = ["protobuf"],
     repositories = [
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
@@ -121,14 +134,17 @@ maven.install(
         "dev.cel:compiler:" + CEL_VERSION,
         "dev.cel:runtime:" + CEL_VERSION,
     ],
+    fail_on_missing_checksum = not CEL_VERSION.endswith("-SNAPSHOT"),
     repositories = [
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
         "https://central.sonatype.com/repository/maven-snapshots/",
+        "m2local",
     ],
 )
 use_repo(maven, "maven", "maven_android", "maven_conformance")
 
 non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
 use_repo(non_module_dependencies, "antlr4_jar")
 use_repo(non_module_dependencies, "bazel_common")
+use_repo(non_module_dependencies, "cel_policy")

README.md

@@ -55,14 +55,14 @@ CEL-Java is available in Maven Central Repository. [Download the JARs here][8] o
 <dependency>
   <groupId>dev.cel</groupId>
   <artifactId>cel</artifactId>
-  <version>0.11.1</version>
+  <version>0.14.0</version>
 </dependency>
 ```
 
 **Gradle**
 
 ```gradle
-implementation 'dev.cel:cel:0.11.1'
+implementation 'dev.cel:cel:0.14.0'
 ```
 
 Then run this example:
@@ -84,7 +84,7 @@ public class HelloWorld {
   private static final CelCompiler CEL_COMPILER =
       CelCompilerFactory.standardCelCompilerBuilder().addVar("my_var", SimpleType.STRING).build();
   private static final CelRuntime CEL_RUNTIME =
-      CelRuntimeFactory.standardCelRuntimeBuilder().build();
+      CelRuntimeFactory.plannerRuntimeBuilder().build();
 
   public void run() throws CelValidationException, CelEvaluationException {
     // Compile the expression into an Abstract Syntax Tree.
@@ -144,7 +144,7 @@ found in the [`CelCompilerBuilder`][9].
 Some CEL use cases only require parsing of an expression in order to be useful.
 For example, one example might want to check whether the expression contains any
 nested comprehensions, or possibly to pass the parsed expression to a C++ or Go
-binary for evaluation. Presently, Java does not support parse-only evaluation.
+binary for evaluation.
 
 ```java
 CelValidationResult parseResult =
@@ -231,7 +231,7 @@ Expressions can be evaluated using once they are type-checked/compiled by
 creating a `CelRuntime.Program` from a `CelAbstractSyntaxTree`:
 
 ```java
-CelRuntime celRuntime = CelRuntimeFactory.standardCelRuntimeBuilder().build();
+CelRuntime celRuntime = CelRuntimeFactory.plannerRuntimeBuilder().build();
 try {
   CelRuntime.Program program = celRuntime.createProgram(compileResult.getAst());
   return program.eval(
@@ -376,14 +376,14 @@ Java 8 or newer is required.
 
 Released under the [Apache License](LICENSE).
 
-[1]:  https://github.com/google/cel-spec
+[1]:  https://github.com/cel-expr/cel-spec
 [2]:  https://groups.google.com/forum/#!forum/cel-java-discuss
 [3]:  https://github.com/google/guava
 [4]:  https://github.com/google/re2j
 [5]:  https://github.com/protocolbuffers/protobuf/tree/master/java
 [6]:  https://github.com/antlr/antlr4/tree/master/runtime/Java
-[7]:  https://github.com/google/cel-java/issues
+[7]:  https://github.com/cel-expr/cel-java/issues
 [8]:  https://search.maven.org/search?q=g:dev.cel
-[9]:  https://github.com/google/cel-java/blob/main/compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java
-[10]:  https://github.com/google/cel-spec/blob/master/doc/langdef.md#macros
-[11]:  https://github.com/google/cel-java/blob/main/extensions/src/main/java/dev/cel/extensions/README.md
+[9]:  https://github.com/cel-expr/cel-java/blob/main/compiler/src/main/java/dev/cel/compiler/CelCompilerBuilder.java
+[10]:  https://github.com/cel-expr/cel-spec/blob/master/doc/langdef.md#macros
+[11]:  https://github.com/cel-expr/cel-java/blob/main/extensions/src/main/java/dev/cel/extensions/README.md

bundle/BUILD.bazel

@@ -7,7 +7,10 @@ package(
 
 java_library(
     name = "cel",
-    exports = ["//bundle/src/main/java/dev/cel/bundle:cel"],
+    exports = [
+        "//bundle/src/main/java/dev/cel/bundle:cel",
+        "//bundle/src/main/java/dev/cel/bundle:cel_factory",
+    ],
 )
 
 java_library(
@@ -27,6 +30,12 @@ java_library(
 
 java_library(
     name = "environment_exporter",
-    visibility = ["//:internal"],
     exports = ["//bundle/src/main/java/dev/cel/bundle:environment_exporter"],
 )
+
+java_library(
+    name = "cel_impl",
+    testonly = 1,
+    visibility = ["//:internal"],
+    exports = ["//bundle/src/main/java/dev/cel/bundle:cel_impl"],
+)