Skip to content

Split CelComprehensionsExtensions into CelComprehensionsCompilerLibrary and CelComprehensionsRuntimeLibrary to allow its usage in Lite runtime. #1308

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Split CelComprehensionsExtensions into CelComprehensionsCompilerLibrary and CelComprehensionsRuntimeLibrary to allow its usage in Lite runtime. #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 39 additions & 0 deletions extensions/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,23 @@ java_library(
exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions"],
)

java_library(
name = "comprehensions_compiler_library",
visibility = ["//:internal"],
exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions_compiler_library"],
)

java_library(
name = "comprehensions_runtime_library",
visibility = ["//:internal"],
exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions_runtime_library"],
)

cel_android_library(
name = "comprehensions_runtime_library_android",
exports = ["//extensions/src/main/java/dev/cel/extensions:comprehensions_runtime_library_android"],
)

java_library(
name = "native",
exports = ["//extensions/src/main/java/dev/cel/extensions:native"],
Expand Down Expand Up @@ -141,3 +158,25 @@ cel_android_library(
name = "lists_runtime_library_android",
exports = ["//extensions/src/main/java/dev/cel/extensions:lists_runtime_library_android"],
)

java_library(
name = "regex",
exports = ["//extensions/src/main/java/dev/cel/extensions:regex"],
)

java_library(
name = "regex_compiler_library",
visibility = ["//:internal"],
exports = ["//extensions/src/main/java/dev/cel/extensions:regex_compiler_library"],
)

java_library(
name = "regex_runtime_library",
visibility = ["//:internal"],
exports = ["//extensions/src/main/java/dev/cel/extensions:regex_runtime_library"],
)

cel_android_library(
name = "regex_runtime_library_android",
exports = ["//extensions/src/main/java/dev/cel/extensions:regex_runtime_library_android"],
)
120 changes: 112 additions & 8 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,42 +483,146 @@ cel_android_library(
java_library(
name = "regex",
srcs = ["CelRegexExtensions.java"],
tags = [
],
deps = [
":extension_library",
":regex_compiler_library",
":regex_runtime_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common/types",
"//common:cel_function_decl",
"//compiler:compiler_builder",
"//extensions:extension_library",
"//runtime",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

java_library(
name = "regex_compiler_library",
srcs = ["CelRegexCompilerLibrary.java"],
tags = [
],
deps = [
":extension_library",
"//checker:checker_builder",
"//common:cel_function_decl",
"//common:cel_overload_decl",
"//common/types",
"//compiler:compiler_builder",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

java_library(
name = "regex_runtime_library",
srcs = ["CelRegexRuntimeLibrary.java"],
tags = [
],
deps = [
"//runtime:function_binding",
"//runtime:lite_runtime",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_re2j_re2j",
],
)

cel_android_library(
name = "regex_runtime_library_android",
srcs = ["CelRegexRuntimeLibrary.java"],
tags = [
],
deps = [
"//runtime:function_binding_android",
"//runtime:lite_runtime_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_re2j_re2j",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "comprehensions",
srcs = ["CelComprehensionsExtensions.java"],
tags = [
],
deps = [
":comprehensions_compiler_library",
":comprehensions_runtime_library",
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:operator",
"//common:cel_function_decl",
"//common:options",
"//compiler:compiler_builder",
"//parser:macro",
"//parser:parser_builder",
"//runtime",
"//runtime:runtime_equality",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

java_library(
name = "comprehensions_compiler_library",
srcs = ["CelComprehensionsCompilerLibrary.java"],
tags = [
"alt_dep=//extensions:comprehensions_compiler_library",
],
deps = [
":extension_library",
"//checker:checker_builder",
"//common:cel_function_decl",
"//common:cel_issue",
"//common:cel_overload_decl",
"//common:operator",
"//common/ast",
"//common/types",
"//common/values:mutable_map_value",
"//compiler:compiler_builder",
"//extensions:extension_library",
"//parser:macro",
"//parser:parser_builder",
"//runtime",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

java_library(
name = "comprehensions_runtime_library",
srcs = ["CelComprehensionsRuntimeLibrary.java"],
tags = [
"alt_dep=//extensions:comprehensions_runtime_library",
],
deps = [
"//common:options",
"//common/values:mutable_map_value",
"//runtime:function_binding",
"//runtime:lite_runtime",
"//runtime:runtime_equality",
"//runtime:runtime_helpers",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

cel_android_library(
name = "comprehensions_runtime_library_android",
srcs = ["CelComprehensionsRuntimeLibrary.java"],
tags = [
],
deps = [
"//common:options",
"//common/values:mutable_map_value_android",
"//runtime:function_binding_android",
"//runtime:lite_runtime_android",
"//runtime:runtime_equality_android",
"//runtime:runtime_helpers_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "native",
srcs = ["CelNativeTypesExtensions.java"],
Expand Down
Loading
Loading