Skip to content

Prepare for 0.10.0 release #715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0</version>
<version>0.10.0</version>
</dependency>
```

**Gradle**

```gradle
implementation 'dev.cel:cel:0.9.0'
implementation 'dev.cel:cel:0.10.0'
```

Then run this example:
Expand Down
19 changes: 5 additions & 14 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,17 @@ register_toolchains(

### googleapis setup

# as of 12/08/2022
# as of 06/06/2025
http_archive(
name = "com_google_googleapis",
sha256 = "8503282213779a3c230251218c924f385f457a053b4f82ff95d068f71815e558",
strip_prefix = "googleapis-d73a41615b101c34c58b3534c2cc7ee1d89cccb0",
sha256 = "228c134e606a10d9103ff2b22622989bbf13cc2a54ff626ff9ef6c1c7713e3b8",
strip_prefix = "googleapis-1804a603281707a1f0e6fff27851cae115ac3c8b",
urls = [
"https://github.com/googleapis/googleapis/archive/d73a41615b101c34c58b3534c2cc7ee1d89cccb0.tar.gz",
"https://github.com/googleapis/googleapis/archive/1804a603281707a1f0e6fff27851cae115ac3c8b.tar.gz",
],
)


load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")

switched_rules_by_language(
Expand Down Expand Up @@ -264,16 +265,6 @@ http_archive(
],
)

# required by cel_spec
http_archive(
name = "io_bazel_rules_go",
sha256 = "19ef30b21eae581177e0028f6f4b1f54c66467017be33d211ab6fc81da01ea4d",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
],
)

http_jar(
name = "antlr4_jar",
sha256 = "eae2dfa119a64327444672aff63e9ec35a20180dc5b8090b7a6ab85125df4d76",
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ java_library(
],
deps = [
"//:auto_value",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.auto.value.AutoValue;
import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Beta;

/**
* Options to configure how the CEL parser, type-checker, and evaluator behave.
Expand Down Expand Up @@ -434,6 +435,7 @@ public abstract static class Builder {
*
* <p>Warning: This option is experimental.
*/
@Beta
public abstract Builder enableCelValue(boolean value);

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ package(

# keep sorted
ANNOTATION_SOURCES = [
"Beta.java",
"Generated.java",
"Internal.java",
]
Expand Down
38 changes: 38 additions & 0 deletions common/src/main/java/dev/cel/common/annotations/Beta.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.annotations;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Indicates a public API that can change at any time, and has no guarantee of API stability and
* backward-compatibility.
*
* <p>Note: This annotation is intended only for CEL library code. Users should not attach this
* annotation to their own code.
*/
@Retention(RetentionPolicy.CLASS)
@Target({
ElementType.ANNOTATION_TYPE,
ElementType.CONSTRUCTOR,
ElementType.FIELD,
ElementType.METHOD,
ElementType.PACKAGE,
ElementType.TYPE
})
public @interface Beta {}
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ java_library(
":base_proto_message_value_provider",
":cel_value",
":proto_message_lite_value",
"//common/annotations",
"//common/internal:cel_lite_descriptor_pool",
"//common/internal:default_lite_descriptor_pool",
"//common/values:base_proto_cel_value_converter",
Expand All @@ -327,6 +328,7 @@ cel_android_library(
":base_proto_message_value_provider_android",
":cel_value_android",
":proto_message_lite_value_android",
"//common/annotations",
"//common/internal:cel_lite_descriptor_pool_android",
"//common/internal:default_lite_descriptor_pool_android",
"//common/values:base_proto_cel_value_converter_android",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
import dev.cel.common.annotations.Beta;
import dev.cel.common.internal.CelLiteDescriptorPool;
import dev.cel.common.internal.DefaultLiteDescriptorPool;
import dev.cel.protobuf.CelLiteDescriptor;
Expand All @@ -30,6 +31,7 @@
* fully qualified name and its fields to populate.
*/
@Immutable
@Beta
public class ProtoMessageLiteValueProvider extends BaseProtoMessageValueProvider {
private final CelLiteDescriptorPool descriptorPool;
private final ProtoLiteCelValueConverter protoLiteCelValueConverter;
Expand Down
1 change: 1 addition & 0 deletions policy/src/main/java/dev/cel/policy/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package(
default_applicable_licenses = ["//:license"],
default_visibility = [
"//policy:__pkg__",
"//publish:__pkg__",
],
)

Expand Down
5 changes: 4 additions & 1 deletion protobuf/src/main/java/dev/cel/protobuf/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ load("@rules_java//java:defs.bzl", "java_binary", "java_library")

package(
default_applicable_licenses = ["//:license"],
default_visibility = ["//protobuf:__pkg__"],
default_visibility = [
"//protobuf:__pkg__",
"//publish:__pkg__",
],
)

java_binary(
Expand Down
47 changes: 46 additions & 1 deletion publish/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:unknown_attributes",
]

LITE_RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime:lite_runtime_android",
"//runtime/src/main/java/dev/cel/runtime:lite_runtime_factory_android",
"//runtime/src/main/java/dev/cel/runtime:lite_runtime_library_android",
"//common/src/main/java/dev/cel/common:proto_ast_android", # Note: included due to generated protos requiring protolite dependency
"//common/src/main/java/dev/cel/common/values:proto_message_lite_value_provider_android",
"//protobuf/src/main/java/dev/cel/protobuf:cel_lite_descriptor",
]

COMPILER_TARGETS = [
"//parser/src/main/java/dev/cel/parser",
"//parser/src/main/java/dev/cel/parser:parser_builder",
Expand Down Expand Up @@ -47,6 +56,21 @@ OPTIMIZER_TARGETS = [
"//optimizer/src/main/java/dev/cel/optimizer/optimizers:common_subexpression_elimination",
]

POLICY_COMPILER_TARGETS = [
"//policy/src/main/java/dev/cel/policy:policy",
"//policy/src/main/java/dev/cel/policy:source",
"//policy/src/main/java/dev/cel/policy:validation_exception",
"//policy/src/main/java/dev/cel/policy:parser_factory",
"//policy/src/main/java/dev/cel/policy:yaml_parser",
"//policy/src/main/java/dev/cel/policy:parser",
"//policy/src/main/java/dev/cel/policy:parser_builder",
"//policy/src/main/java/dev/cel/policy:compiler",
"//policy/src/main/java/dev/cel/policy:compiler_builder",
"//policy/src/main/java/dev/cel/policy:compiler_factory",
"//policy/src/main/java/dev/cel/policy:policy_parser_context",
"//policy/src/main/java/dev/cel/policy:compiled_rule",
]

V1ALPHA1_AST_TARGETS = [
"//common/src/main/java/dev/cel/common:proto_v1alpha1_ast",
]
Expand All @@ -62,7 +86,7 @@ EXTENSION_TARGETS = [

ALL_TARGETS = [
"//bundle/src/main/java/dev/cel/bundle:cel",
] + RUNTIME_TARGETS + COMPILER_TARGETS + EXTENSION_TARGETS + V1ALPHA1_AST_TARGETS + CANONICAL_AST_TARGETS + OPTIMIZER_TARGETS + VALIDATOR_TARGETS
] + RUNTIME_TARGETS + COMPILER_TARGETS + EXTENSION_TARGETS + V1ALPHA1_AST_TARGETS + CANONICAL_AST_TARGETS + OPTIMIZER_TARGETS + VALIDATOR_TARGETS + POLICY_COMPILER_TARGETS

# Excluded from the JAR as their source of truth is elsewhere
EXCLUDED_TARGETS = [
Expand Down Expand Up @@ -178,3 +202,24 @@ java_export(
pom_template = ":cel_protobuf_pom",
runtime_deps = CANONICAL_AST_TARGETS,
)

pom_file(
name = "cel_runtime_android_pom",
substitutions = {
"CEL_VERSION": CEL_VERSION,
"CEL_ARTIFACT_ID": "runtime-android",
"PACKAGE_NAME": "CEL Java Runtime for Android",
"PACKAGE_DESC": "Common Expression Language Lite Runtime for Java (Suitable for Android)",
},
targets = LITE_RUNTIME_TARGETS,
template_file = "pom_template.xml",
)

java_export(
name = "cel_runtime_android",
deploy_env = EXCLUDED_TARGETS,
javadocopts = JAVA_DOC_OPTIONS,
maven_coordinates = "dev.cel:runtime-android:%s" % CEL_VERSION,
pom_template = ":cel_runtime_android_pom",
runtime_deps = LITE_RUNTIME_TARGETS,
)
2 changes: 1 addition & 1 deletion publish/cel_version.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Maven artifact version for CEL."""
CEL_VERSION = "0.9.1"
CEL_VERSION = "0.10.0"
2 changes: 1 addition & 1 deletion publish/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# 2. You will need to enter the key's password. The prompt appears in GUI, not in terminal. The publish operation will eventually timeout if the password is not entered.


ALL_TARGETS=("//publish:cel.publish" "//publish:cel_compiler.publish" "//publish:cel_runtime.publish" "//publish:cel_v1alpha1.publish" "//publish:cel_protobuf.publish")
ALL_TARGETS=("//publish:cel.publish" "//publish:cel_compiler.publish" "//publish:cel_runtime.publish" "//publish:cel_v1alpha1.publish" "//publish:cel_protobuf.publish" "//publish:cel_runtime_android.publish")
JDK8_FLAGS="--java_language_version=8 --java_runtime_version=8"

function publish_maven_remote() {
Expand Down
11 changes: 4 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -648,14 +648,8 @@ cel_android_library(
deps = [
":function_binding_android",
":runtime_equality_android",
":runtime_helpers_android",
"//common:error_codes",
"//common:options",
"//common:runtime_exception",
"//common/annotations",
"//common/internal:comparison_functions_android",
"//common/internal:proto_time_utils_android",
"//common/internal:safe_string_formatter",
"//runtime/standard:add_android",
"//runtime/standard:bool_android",
"//runtime/standard:bytes_android",
Expand Down Expand Up @@ -831,6 +825,7 @@ java_library(
"//:auto_value",
"//common:cel_ast",
"//common:options",
"//common/annotations",
"//common/values:cel_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
Expand Down Expand Up @@ -912,6 +907,7 @@ java_library(
deps = [
":lite_runtime",
":lite_runtime_impl",
"//common/annotations",
],
)

Expand All @@ -925,6 +921,7 @@ cel_android_library(
deps = [
":lite_runtime_android",
":lite_runtime_impl_android",
"//common/annotations",
],
)

Expand Down Expand Up @@ -1085,10 +1082,10 @@ cel_android_library(
":evaluation_exception",
":function_binding_android",
":function_resolver",
":standard_functions_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
"//common/annotations",
"//common/values:cel_value_provider_android",
"//runtime/standard:standard_function_android",
"@maven//:com_google_code_findbugs_annotations",
Expand Down
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelLiteRuntime.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.annotations.Beta;
import java.util.Map;

/**
Expand All @@ -27,6 +28,7 @@
* the protobuf, making it suitable for use in Android.
*/
@ThreadSafe
@Beta
public interface CelLiteRuntime {

Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

package dev.cel.runtime;

import dev.cel.common.annotations.Beta;

/** Factory class for producing a lite runtime environment. */
@Beta
public final class CelLiteRuntimeFactory {

/** Create a new builder for constructing a {@code CelLiteRuntime} instance. */
Expand Down