Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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
38 changes: 24 additions & 14 deletions .github/workflows/unwanted_deps.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,31 @@

# Script ran as part of Github CEL-Java CI to verify that the runtime jar does not contain unwanted dependencies.

UNWANTED_DEPS=(
'@cel_spec' # Do not include generated CEL protos in the jar
'protobuf_java_util' # Does not support protolite
)

runtime_deps="$(bazel query 'deps(//publish:cel_runtime)' --nohost_deps --noimplicit_deps --output graph)"

for unwanted_dep in "${UNWANTED_DEPS[@]}"; do
if echo "$runtime_deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "Runtime contains unwanted dependency: $unwanted_dep!\n"
echo "cel_spec dependency graph (including '$unwanted_dep'):"
echo "$(echo "$runtime_deps" | grep "$unwanted_dep")"
function checkUnwantedDeps {
target="$1"
unwanted_dep="$2"

query="bazel query 'deps(${target})' --notool_deps --noimplicit_deps --output graph"
deps=$(eval $query)

if echo "$deps" | grep "$unwanted_dep" > /dev/null; then
echo -e "$target contains unwanted dependency: $unwanted_dep!\n"
echo "$(echo "$deps" | grep "$unwanted_dep")"
exit 1
fi
done
}

exit 0
# Do not include generated CEL protos in the jar
checkUnwantedDeps '//publish:cel_runtime' '@cel_spec'

# cel_runtime does not support protolite
checkUnwantedDeps '//publish:cel_runtime' 'protobuf_java_util'
checkUnwantedDeps '//publish:cel' 'protobuf_java_util'

# cel_runtime shouldn't depend on the protobuf_lite runtime
checkUnwantedDeps '//publish:cel_runtime' '@maven_android//:com_google_protobuf_protobuf_javalite'
checkUnwantedDeps '//publish:cel' '@maven_android//:com_google_protobuf_protobuf_javalite'

# cel_runtime_android shouldn't depend on the full protobuf runtime
checkUnwantedDeps '//publish:cel_runtime_android' '@maven//:com_google_protobuf_protobuf_java'
exit 0
1 change: 0 additions & 1 deletion common/src/main/java/dev/cel/common/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -114,7 +113,7 @@ java_library(
":ast",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand Down
13 changes: 6 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_antlr_antlr4_runtime",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -132,15 +131,18 @@ DYNAMIC_PROTO_SOURCES = [

java_library(
name = "default_instance_message_factory",
srcs = ["DefaultInstanceMessageFactory.java"],
srcs = [
"DefaultInstanceMessageFactory.java",
"DefaultInstanceMessageLiteFactory.java",
],
tags = [
],
deps = [
":default_instance_message_lite_factory",
":proto_java_qualified_names",
":reflection_util",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -175,7 +177,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -193,7 +194,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All@@ -210,7 +210,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -223,7 +222,6 @@ java_library(
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,7 +162,7 @@ java_library(
"//runtime:function_binding",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand All@@ -187,7 +187,6 @@ java_library(
"//runtime:runtime_equality",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ java_library(
"//common/ast",
"//common/ast:cel_expr_visitor",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
1 change: 0 additions & 1 deletion runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,6 @@ cel_android_library(

java_library(
name = "function_overload_impl",
# used_by_android
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
)
Expand Down
78 changes: 55 additions & 23 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,13 @@ FUNCTION_BINDING_SOURCES = [
"FunctionBindingImpl.java",
]

# keep sorted
FUNCTION_OVERLOAD_IMPL_SOURCES = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
]

# keep sorted
INTERPRABLE_SOURCES = [
"GlobalResolver.java",
Expand DownExpand Up@@ -137,7 +144,7 @@ cel_android_library(
":base_android",
":evaluation_exception",
":evaluation_exception_builder",
":function_overload_impl",
":function_overload_impl_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
Expand All@@ -157,8 +164,8 @@ java_library(
":runtime_helpers",
"//common/annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -202,7 +209,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -254,7 +260,7 @@ cel_android_library(
srcs = BASE_SOURCES,
visibility = ["//visibility:private"],
deps = [
":function_overload_impl",
":function_overload_impl_android",
":metadata",
"//common:cel_ast_android",
"//common/annotations",
Expand DownExpand Up@@ -314,7 +320,7 @@ cel_android_library(
":evaluation_exception",
":evaluation_exception_builder",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
":interpretable_android",
":interpreter_util_android",
":metadata",
Expand DownExpand Up@@ -354,7 +360,7 @@ java_library(
"//common/internal:comparison_functions",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -435,7 +441,6 @@ java_library(
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_re2j_re2j",
"@maven//:org_threeten_threeten_extra",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand DownExpand Up@@ -501,9 +506,9 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_overload",
":function_overload_impl",
":function_resolver",
":function_overload_android",
":function_overload_impl_android",
":function_resolver_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -585,7 +590,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":evaluation_listener_android",
":function_overload_impl",
":function_overload_impl_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
Expand DownExpand Up@@ -723,7 +728,7 @@ cel_android_library(
tags = [
],
deps = [
":function_overload",
":function_overload_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand All@@ -733,7 +738,6 @@ cel_android_library(
java_library(
name = "function_resolver",
srcs = ["CelFunctionResolver.java"],
# used_by_android
tags = [
],
deps = [
Expand All@@ -743,12 +747,21 @@ java_library(
],
)

cel_android_library(
name = "function_resolver_android",
srcs = ["CelFunctionResolver.java"],
deps = [
":function_overload_impl_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
],
# used_by_android
tags = [
],
deps = [
Expand All@@ -757,16 +770,34 @@ java_library(
],
)

java_library(
name = "function_overload_impl",
cel_android_library(
name = "function_overload_android",
srcs = [
"FunctionOverload.java",
"FunctionResolver.java",
"ResolvedOverload.java",
"CelFunctionOverload.java",
],
# used_by_android
deps = [
":function_overload_impl_android",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)

java_library(
name = "function_overload_impl",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
tags = [
],
deps = [
":evaluation_exception",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_protobuf_protobuf_java",
],
)

cel_android_library(
name = "function_overload_impl_android",
srcs = FUNCTION_OVERLOAD_IMPL_SOURCES,
deps = [
":evaluation_exception",
"//common/annotations",
Expand DownExpand Up@@ -812,6 +843,7 @@ java_library(
"//common/types:cel_types",
"//common/values:cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand DownExpand Up@@ -881,7 +913,7 @@ cel_android_library(
":dispatcher_android",
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
":interpretable_android",
":interpreter_android",
":lite_runtime_android",
Expand DownExpand Up@@ -1001,7 +1033,7 @@ java_library(
"//common/values:combined_cel_value_provider",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
"@maven//:com_google_protobuf_protobuf_java",
],
)

Expand DownExpand Up@@ -1086,7 +1118,7 @@ cel_android_library(
deps = [
":evaluation_exception",
":function_binding_android",
":function_resolver",
":function_resolver_android",
"//:auto_value",
"//common:cel_ast_android",
"//common:options",
Expand Down
Loading
Loading