diff --git a/.bazelrc b/.bazelrc new file mode 100644 index 000000000..e8138cbd2 --- /dev/null +++ b/.bazelrc @@ -0,0 +1,2 @@ +# Enable Bzlmod for every Bazel command +common --enable_bzlmod diff --git a/.gitignore b/.gitignore index 753e69672..e8052913c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,6 @@ bazel-cel-java bazel-out bazel-testlogs -MODULE.bazel* - # IntelliJ IDEA .idea *.iml @@ -30,3 +28,6 @@ target # Temporary output dir for artifacts mvn-artifacts + +*.swp +*.lock diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 000000000..7b055ba21 --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,83 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module( + name = "cel_java" +) + +bazel_dep(name = "bazel_skylib", version = "1.4.2") +bazel_dep(name = "rules_jvm_external", version = "6.0") +bazel_dep(name = "protobuf", repo_name="com_google_protobuf", version = "23.1") +bazel_dep(name = "rules_pkg", version = "0.10.1") +bazel_dep(name = "rules_license", version = "0.0.8") +bazel_dep(name = "rules_java", version = "7.4.0") +bazel_dep(name = "cel-spec", repo_name="cel_spec", version = "0.14.0") + +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") + +maven.install( + # keep sorted + artifacts = [ + "com.google.api.grpc:proto-google-common-protos:2.27.0", + "com.google.auto.value:auto-value-annotations:1.10.4", + "com.google.auto.value:auto-value:1.10.4", + "com.google.code.findbugs:annotations:3.0.1", + "com.google.errorprone:error_prone_annotations:2.23.0", + "com.google.guava:guava-testlib:33.0.0-jre", + "com.google.guava:guava:33.0.0-jre", + "com.google.protobuf:protobuf-java-util:3.24.4", + "com.google.protobuf:protobuf-java:3.24.4", + "com.google.re2j:re2j:1.7", + "com.google.testparameterinjector:test-parameter-injector:1.15", + "com.google.truth.extensions:truth-java8-extension:1.4.0", + "com.google.truth.extensions:truth-proto-extension:1.4.0", + "com.google.truth:truth:1.4.0", + "org.antlr:antlr4-runtime:4.11.1", + "org.jspecify:jspecify:0.2.0", + "org.threeten:threeten-extra:1.7.2", + ], + repositories = [ + "https://maven.google.com", + "https://repo1.maven.org/maven2", + ], +) +use_repo(maven, "maven") + +non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies") +use_repo(non_module_dependencies, "antlr4_jar") +use_repo(non_module_dependencies, "bazel_common") + +# Note: We aren't able to use Bazel Central Registry for googleapis +# until https://github.com/bazelbuild/rules_jvm_external/issues/1048 is resolved. +GOOGLE_APIS_VERSION = "d73a41615b101c34c58b3534c2cc7ee1d89cccb0" + +bazel_dep(name = "com_google_googleapis", version = GOOGLE_APIS_VERSION) +archive_override( + module_name = "com_google_googleapis", + integrity = "sha256-sOd1u3SXtn/7CtnH6dxze8ZEkSkRsOJHTusK/STVi0c=", + patch_strip = 1, + patches = [ + # See https://github.com/bazelbuild/rules_go/issues/3685 + "googleapis_add_bzlmod_support.patch" + ], + strip_prefix = "googleapis-" + GOOGLE_APIS_VERSION, + urls = [ + "https://github.com/googleapis/googleapis/archive/%s.zip" % GOOGLE_APIS_VERSION + ], +) + +switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") +switched_rules.use_languages(java = True) +use_repo(switched_rules, "com_google_googleapis_imports") + diff --git a/WORKSPACE b/WORKSPACE deleted file mode 100644 index f7b21a719..000000000 --- a/WORKSPACE +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https:#www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -workspace(name = "cel_java") - -register_toolchains("//:repository_default_toolchain_definition") - -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar") - -http_archive( - name = "bazel_skylib", - sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", - ], -) - -load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") - -bazel_skylib_workspace() - -RULES_JVM_EXTERNAL_TAG = "aa44247b3913da0da606e9c522313b6a9396a571" - -RULES_JVM_EXTERNAL_SHA = "87378580865af690a78230e04eba1cd6d9c60d0db303ea129dc717705d711d9c" - -# rules_jvm_external as of 12/11/2023 -http_archive( - name = "rules_jvm_external", - sha256 = RULES_JVM_EXTERNAL_SHA, - strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, -) - -load("@rules_jvm_external//:defs.bzl", "maven_install") -load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") - -rules_jvm_external_deps() - -load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") - -rules_jvm_external_setup() - -ANTLR4_VERSION = "4.11.1" - -# Important: there can only be one maven_install rule. Add new maven deps here. -maven_install( - # keep sorted - artifacts = [ - "com.google.api.grpc:proto-google-common-protos:2.27.0", - "com.google.auto.value:auto-value:1.10.4", - "com.google.auto.value:auto-value-annotations:1.10.4", - "com.google.code.findbugs:annotations:3.0.1", - "com.google.errorprone:error_prone_annotations:2.23.0", - "com.google.guava:guava:33.0.0-jre", - "com.google.guava:guava-testlib:33.0.0-jre", - "com.google.protobuf:protobuf-java:3.24.4", - "com.google.protobuf:protobuf-java-util:3.24.4", - "com.google.re2j:re2j:1.7", - "com.google.testparameterinjector:test-parameter-injector:1.15", - "com.google.truth.extensions:truth-java8-extension:1.4.0", - "com.google.truth.extensions:truth-proto-extension:1.4.0", - "com.google.truth:truth:1.4.0", - "org.antlr:antlr4-runtime:" + ANTLR4_VERSION, - "org.jspecify:jspecify:0.2.0", - "org.threeten:threeten-extra:1.7.2", - ], - repositories = [ - "https://maven.google.com", - "https://repo1.maven.org/maven2", - ], -) - -http_archive( - name = "com_google_protobuf", - sha256 = "b1d6dd2cbb5d87e17af41cadb720322ce7e13af826268707bd8db47e5654770b", - strip_prefix = "protobuf-21.11", - urls = ["https://github.com/protocolbuffers/protobuf/archive/v21.11.tar.gz"], -) - -# Required by com_google_protobuf -load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") - -protobuf_deps() - -# googleapis as of 12/08/2022 -http_archive( - name = "com_google_googleapis", - sha256 = "8503282213779a3c230251218c924f385f457a053b4f82ff95d068f71815e558", - strip_prefix = "googleapis-d73a41615b101c34c58b3534c2cc7ee1d89cccb0", - urls = [ - "https://github.com/googleapis/googleapis/archive/d73a41615b101c34c58b3534c2cc7ee1d89cccb0.tar.gz", - ], -) - -load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") - -switched_rules_by_language( - name = "com_google_googleapis_imports", - java = True, -) - -# Required by googleapis -http_archive( - name = "rules_pkg", - sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2", - urls = [ - "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz", - ], -) - -load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") - -rules_pkg_dependencies() - -BAZEL_COMMON_TAG = "aaa4d801588f7744c6f4428e4f133f26b8518f42" - -BAZEL_COMMON_SHA = "1f85abb0043f3589b9bf13a80319dc48a5f01a052c68bab3c08015a56d92ab7f" - -http_archive( - name = "bazel_common", - sha256 = BAZEL_COMMON_SHA, - strip_prefix = "bazel-common-%s" % BAZEL_COMMON_TAG, - url = "https://github.com/google/bazel-common/archive/%s.tar.gz" % BAZEL_COMMON_TAG, -) - -# cel-spec api/expr canonical protos -http_archive( - name = "cel_spec", - sha256 = "3579c97b13548714f9059ef6f30c5264d439efef4b438e76e7180709efd93a6b", - strip_prefix = "cel-spec-0.14.0", - urls = [ - "https://github.com/google/cel-spec/archive/refs/tags/v0.14.0.tar.gz", - ], -) - -# required by cel_spec -http_archive( - name = "io_bazel_rules_go", - sha256 = "19ef30b21eae581177e0028f6f4b1f54c66467017be33d211ab6fc81da01ea4d", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip", - ], -) - -http_jar( - name = "antlr4_jar", - sha256 = "62975e192b4af2622b72b5f0131553ee3cbce97f76dc2a41632dcc55e25473e1", - urls = ["https://www.antlr.org/download/antlr-" + ANTLR4_VERSION + "-complete.jar"], -) - -# Load license rules. -http_archive( - name = "rules_license", - sha256 = "6157e1e68378532d0241ecd15d3c45f6e5cfd98fc10846045509fb2a7cc9e381", - urls = [ - "https://github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz", - ], -) diff --git a/bundle/src/test/java/dev/cel/bundle/BUILD.bazel b/bundle/src/test/java/dev/cel/bundle/BUILD.bazel index cccfc8eed..0c5ef6e0b 100644 --- a/bundle/src/test/java/dev/cel/bundle/BUILD.bazel +++ b/bundle/src/test/java/dev/cel/bundle/BUILD.bazel @@ -9,8 +9,8 @@ java_library( testonly = True, srcs = glob(["*Test.java"]), deps = [ - "//:auto_value", - "//:java_truth", + ":auto_value", + ":java_truth", "//bundle:cel", "//checker", "//checker:checker_legacy_environment", diff --git a/checker/src/main/java/dev/cel/checker/BUILD.bazel b/checker/src/main/java/dev/cel/checker/BUILD.bazel index 0053d9061..c2edb746b 100644 --- a/checker/src/main/java/dev/cel/checker/BUILD.bazel +++ b/checker/src/main/java/dev/cel/checker/BUILD.bazel @@ -44,7 +44,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/annotations", "//common/internal:file_descriptor_converter", "//common/types", @@ -64,12 +64,12 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":cel_ident_decl", ":checker_builder", ":checker_legacy_environment", ":proto_type_mask", ":type_provider_legacy_impl", - "//:auto_value", "//common", "//common:compiler_common", "//common:options", @@ -112,7 +112,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", @@ -127,7 +127,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/annotations", "//common/ast", "//common/ast:expr_converter", @@ -145,8 +145,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":checker_legacy_environment", - "//:auto_value", "//common/annotations", "//common/types", "//common/types:cel_types", @@ -164,8 +164,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":cel_ident_decl", - "//:auto_value", "//common:compiler_common", "//common:features", "//common:options", @@ -194,7 +194,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/types", "//common/types:type_providers", "@maven//:com_google_errorprone_error_prone_annotations", diff --git a/checker/src/test/java/dev/cel/checker/BUILD.bazel b/checker/src/test/java/dev/cel/checker/BUILD.bazel index 338dcbb10..2ee9ac9b4 100644 --- a/checker/src/test/java/dev/cel/checker/BUILD.bazel +++ b/checker/src/test/java/dev/cel/checker/BUILD.bazel @@ -11,7 +11,7 @@ java_library( resources = ["//checker/src/test/resources:baselines"], deps = [ # "//java/com/google/testing/testsize:annotations", - "//:auto_value", + ":auto_value", "//checker", "//checker:cel_ident_decl", "//checker:checker_builder", @@ -45,7 +45,7 @@ java_library( "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:org_jspecify_jspecify", "@maven//:junit_junit", - "//:java_truth", + ":java_truth", "@maven//:com_google_truth_extensions_truth_proto_extension", "@cel_spec//proto/cel/expr:expr_java_proto", "@maven//:com_google_api_grpc_proto_google_common_protos", diff --git a/codelab/src/test/codelab/BUILD.bazel b/codelab/src/test/codelab/BUILD.bazel index 40025f21d..2139627f5 100644 --- a/codelab/src/test/codelab/BUILD.bazel +++ b/codelab/src/test/codelab/BUILD.bazel @@ -8,7 +8,7 @@ java_test( tags = ["notap"], test_class = "codelab.Exercise1Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab", "//common", "//compiler", @@ -23,7 +23,7 @@ java_test( tags = ["notap"], test_class = "codelab.Exercise2Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab", "//common", "//common/types", @@ -41,7 +41,7 @@ java_test( tags = ["notap"], test_class = "codelab.Exercise3Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab", "//runtime", "@maven//:com_google_testparameterinjector_test_parameter_injector", @@ -55,7 +55,7 @@ java_test( tags = ["notap"], test_class = "codelab.Exercise4Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab", "//common", "@maven//:com_google_api_grpc_proto_google_common_protos", diff --git a/codelab/src/test/codelab/solutions/BUILD.bazel b/codelab/src/test/codelab/solutions/BUILD.bazel index c368a8353..db03480d2 100644 --- a/codelab/src/test/codelab/solutions/BUILD.bazel +++ b/codelab/src/test/codelab/solutions/BUILD.bazel @@ -7,7 +7,7 @@ java_test( srcs = ["Exercise1Test.java"], test_class = "codelab.solutions.Exercise1Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab:solutions", "//common", "//compiler", @@ -21,7 +21,7 @@ java_test( srcs = ["Exercise2Test.java"], test_class = "codelab.solutions.Exercise2Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab:solutions", "//common", "//common/types", @@ -38,7 +38,7 @@ java_test( srcs = ["Exercise3Test.java"], test_class = "codelab.solutions.Exercise3Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab:solutions", "//runtime", "@maven//:com_google_testparameterinjector_test_parameter_injector", @@ -51,7 +51,7 @@ java_test( srcs = ["Exercise4Test.java"], test_class = "codelab.solutions.Exercise4Test", deps = [ - "//:java_truth", + ":java_truth", "//codelab:solutions", "//common", "@maven//:com_google_api_grpc_proto_google_common_protos", diff --git a/common/src/main/java/dev/cel/common/BUILD.bazel b/common/src/main/java/dev/cel/common/BUILD.bazel index 31b593708..f52396132 100644 --- a/common/src/main/java/dev/cel/common/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/BUILD.bazel @@ -38,8 +38,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":error_codes", - "//:auto_value", "//common/annotations", "//common/ast", "//common/ast:expr_converter", @@ -61,8 +61,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":common", - "//:auto_value", "//common/annotations", "//common/internal:safe_string_formatter", "//common/types:cel_types", @@ -80,8 +80,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":features", - "//:auto_value", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", ], diff --git a/common/src/main/java/dev/cel/common/ast/BUILD.bazel b/common/src/main/java/dev/cel/common/ast/BUILD.bazel index 9ed6c80fc..ed1997d45 100644 --- a/common/src/main/java/dev/cel/common/ast/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/ast/BUILD.bazel @@ -45,7 +45,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", diff --git a/common/src/main/java/dev/cel/common/internal/BUILD.bazel b/common/src/main/java/dev/cel/common/internal/BUILD.bazel index e373f442b..8e8f7499c 100644 --- a/common/src/main/java/dev/cel/common/internal/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/internal/BUILD.bazel @@ -37,7 +37,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/annotations", "//common/ast", "@maven//:com_google_errorprone_error_prone_annotations", @@ -53,7 +53,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", @@ -70,7 +70,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:org_jspecify_jspecify", @@ -83,7 +83,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", @@ -116,10 +116,10 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":converter", ":proto_message_factory", ":well_known_proto", - "//:auto_value", "//common:error_codes", "//common:runtime_exception", "//common/annotations", @@ -138,8 +138,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":dynamic_proto", - "//:auto_value", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", @@ -156,7 +156,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", diff --git a/common/src/main/java/dev/cel/common/navigation/BUILD.bazel b/common/src/main/java/dev/cel/common/navigation/BUILD.bazel index 903ae3f0f..3eb2bf9ac 100644 --- a/common/src/main/java/dev/cel/common/navigation/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/navigation/BUILD.bazel @@ -18,7 +18,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common/ast", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", @@ -35,8 +35,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":common", - "//:auto_value", "//common", "//common/ast", "@maven//:com_google_errorprone_error_prone_annotations", @@ -54,8 +54,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":common", - "//:auto_value", "//common/ast:mutable_ast", "//common/types:type_providers", "@maven//:com_google_errorprone_error_prone_annotations", diff --git a/common/src/main/java/dev/cel/common/types/BUILD.bazel b/common/src/main/java/dev/cel/common/types/BUILD.bazel index 1a3f3ca0d..c0bec2092 100644 --- a/common/src/main/java/dev/cel/common/types/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/types/BUILD.bazel @@ -43,8 +43,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":type_providers", - "//:auto_value", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", @@ -55,8 +55,8 @@ java_library( name = "cel_internal_types", srcs = CEL_INTERNAL_TYPE_SOURCES, deps = [ + ":auto_value", ":type_providers", - "//:auto_value", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", @@ -100,9 +100,9 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":type_providers", ":types", - "//:auto_value", "@maven//:com_google_errorprone_error_prone_annotations", ], ) @@ -126,10 +126,10 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":cel_types", ":type_providers", ":types", - "//:auto_value", "//common", "//common/internal:file_descriptor_converter", "@maven//:com_google_errorprone_error_prone_annotations", diff --git a/common/src/main/java/dev/cel/common/values/BUILD.bazel b/common/src/main/java/dev/cel/common/values/BUILD.bazel index 766e22309..12e93c3f7 100644 --- a/common/src/main/java/dev/cel/common/values/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/values/BUILD.bazel @@ -70,9 +70,9 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":cel_byte_string", ":cel_value", - "//:auto_value", "//common:error_codes", "//common:options", "//common:runtime_exception", @@ -102,9 +102,9 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":cel_value", ":values", - "//:auto_value", "//common:options", "//common/annotations", "//common/internal:cel_descriptor_pools", diff --git a/common/src/test/java/dev/cel/common/BUILD.bazel b/common/src/test/java/dev/cel/common/BUILD.bazel index d22f00e7f..4050fe3ef 100644 --- a/common/src/test/java/dev/cel/common/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/BUILD.bazel @@ -9,7 +9,7 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//common", "//common:compiler_common", "//common:features", diff --git a/common/src/test/java/dev/cel/common/ast/BUILD.bazel b/common/src/test/java/dev/cel/common/ast/BUILD.bazel index 103f4804a..a72a6c79c 100644 --- a/common/src/test/java/dev/cel/common/ast/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/ast/BUILD.bazel @@ -9,8 +9,8 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//:auto_value", - "//:java_truth", + ":auto_value", + ":java_truth", "//common", "//common:compiler_common", "//common:options", diff --git a/common/src/test/java/dev/cel/common/internal/BUILD.bazel b/common/src/test/java/dev/cel/common/internal/BUILD.bazel index 41d98f6c8..3b846c12b 100644 --- a/common/src/test/java/dev/cel/common/internal/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/internal/BUILD.bazel @@ -10,7 +10,7 @@ java_library( srcs = glob(["*.java"]), resources = ["//common/src/test/resources"], deps = [ - "//:java_truth", + ":java_truth", "//common", "//common:options", "//common/ast", diff --git a/common/src/test/java/dev/cel/common/navigation/BUILD.bazel b/common/src/test/java/dev/cel/common/navigation/BUILD.bazel index 40e04a70d..ee033832f 100644 --- a/common/src/test/java/dev/cel/common/navigation/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/navigation/BUILD.bazel @@ -7,7 +7,7 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//common", "//common:compiler_common", "//common:options", diff --git a/common/src/test/java/dev/cel/common/types/BUILD.bazel b/common/src/test/java/dev/cel/common/types/BUILD.bazel index 44f3fac01..d012c9ed0 100644 --- a/common/src/test/java/dev/cel/common/types/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/types/BUILD.bazel @@ -7,7 +7,7 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//common/resources/testdata/proto2:messages_extensions_proto2_java_proto", "//common/resources/testdata/proto2:messages_proto2_java_proto", "//common/resources/testdata/proto3:test_all_types_java_proto", diff --git a/common/src/test/java/dev/cel/common/values/BUILD.bazel b/common/src/test/java/dev/cel/common/values/BUILD.bazel index 5b3ac349c..3388b4465 100644 --- a/common/src/test/java/dev/cel/common/values/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/values/BUILD.bazel @@ -7,7 +7,7 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//bundle:cel", "//common", "//common:options", diff --git a/compiler/src/main/java/dev/cel/compiler/BUILD.bazel b/compiler/src/main/java/dev/cel/compiler/BUILD.bazel index fc20e8170..f14a90140 100644 --- a/compiler/src/main/java/dev/cel/compiler/BUILD.bazel +++ b/compiler/src/main/java/dev/cel/compiler/BUILD.bazel @@ -55,7 +55,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//checker:checker_builder", "//checker:checker_legacy_environment", "//checker:proto_type_mask", diff --git a/extensions/src/test/java/dev/cel/extensions/BUILD.bazel b/extensions/src/test/java/dev/cel/extensions/BUILD.bazel index c2a362a81..9ef96ddb3 100644 --- a/extensions/src/test/java/dev/cel/extensions/BUILD.bazel +++ b/extensions/src/test/java/dev/cel/extensions/BUILD.bazel @@ -7,7 +7,7 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//bundle:cel", "//common", "//common:compiler_common", diff --git a/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel b/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel index d7833098f..8d772cc58 100644 --- a/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel +++ b/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel @@ -66,8 +66,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":optimization_exception", - "//:auto_value", "//bundle:cel", "//common", "//common:compiler_common", @@ -85,7 +85,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//common", "//common/annotations", "//common/ast", diff --git a/optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel b/optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel index 95acee0f9..de67db717 100644 --- a/optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel +++ b/optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel @@ -14,7 +14,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//bundle:cel", "//common:compiler_common", "//common/ast", @@ -40,7 +40,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "//bundle:cel", "//checker:checker_legacy_environment", "//common", diff --git a/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel b/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel index 4d751e4f9..cd1de3b91 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel +++ b/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel @@ -7,7 +7,7 @@ java_library( testonly = 1, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//bundle:cel", "//common", "//common:compiler_common", diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel b/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel index 5973bca8e..c5cd6a813 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel @@ -32,7 +32,7 @@ java_library( "//testing:baseline_test_case", "@maven//:junit_junit", "@maven//:com_google_testparameterinjector_test_parameter_injector", - "//:java_truth", + ":java_truth", "@maven//:com_google_guava_guava", ], ) diff --git a/parser/src/main/java/dev/cel/parser/BUILD.bazel b/parser/src/main/java/dev/cel/parser/BUILD.bazel index f49628e34..5672ae78a 100644 --- a/parser/src/main/java/dev/cel/parser/BUILD.bazel +++ b/parser/src/main/java/dev/cel/parser/BUILD.bazel @@ -78,8 +78,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":operator", - "//:auto_value", "//common", "//common:compiler_common", "//common/ast", diff --git a/parser/src/test/java/dev/cel/parser/BUILD.bazel b/parser/src/test/java/dev/cel/parser/BUILD.bazel index 270c412c5..401aae1a4 100644 --- a/parser/src/test/java/dev/cel/parser/BUILD.bazel +++ b/parser/src/test/java/dev/cel/parser/BUILD.bazel @@ -10,8 +10,8 @@ java_library( srcs = glob(["*Test.java"]), resources = ["//parser/src/test/resources:baselines"], deps = [ - "//:auto_value", - "//:java_truth", + ":auto_value", + ":java_truth", "//common", "//common:compiler_common", "//common:options", diff --git a/repositories.bzl b/repositories.bzl new file mode 100644 index 000000000..1fb954fca --- /dev/null +++ b/repositories.bzl @@ -0,0 +1,53 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Manages bazel dependencies that are not present in bazel central registry.""" + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar") + +def antlr4_jar_dependency(): + http_jar( + name = "antlr4_jar", + sha256 = "62975e192b4af2622b72b5f0131553ee3cbce97f76dc2a41632dcc55e25473e1", + urls = ["https://www.antlr.org/download/antlr-4.11.1-complete.jar"], + ) + +def bazel_common_dependency(): + bazel_common_tag = "aaa4d801588f7744c6f4428e4f133f26b8518f42" + bazel_common_sha = "1f85abb0043f3589b9bf13a80319dc48a5f01a052c68bab3c08015a56d92ab7f" + http_archive( + name = "bazel_common", + sha256 = bazel_common_sha, + strip_prefix = "bazel-common-%s" % bazel_common_tag, + url = "https://github.com/google/bazel-common/archive/%s.tar.gz" % bazel_common_tag, + ) + +def googleapis_dependency(): + http_archive( + name = "com_google_googleapis", + sha256 = "8503282213779a3c230251218c924f385f457a053b4f82ff95d068f71815e558", + strip_prefix = "googleapis-d73a41615b101c34c58b3534c2cc7ee1d89cccb0", + urls = [ + "https://github.com/googleapis/googleapis/archive/d73a41615b101c34c58b3534c2cc7ee1d89cccb0.tar.gz", + ], + ) + +def _non_module_dependencies_impl(_ctx): + antlr4_jar_dependency() + bazel_common_dependency() + googleapis_dependency() + +non_module_dependencies = module_extension( + implementation = _non_module_dependencies_impl, +) diff --git a/runtime/src/main/java/dev/cel/runtime/BUILD.bazel b/runtime/src/main/java/dev/cel/runtime/BUILD.bazel index 335c6e332..4516077d3 100644 --- a/runtime/src/main/java/dev/cel/runtime/BUILD.bazel +++ b/runtime/src/main/java/dev/cel/runtime/BUILD.bazel @@ -44,8 +44,8 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":runtime_helper", - "//:auto_value", "//common", "//common:error_codes", "//common:options", @@ -75,11 +75,11 @@ java_library( ], exports = [":base"], deps = [ + ":auto_value", ":base", ":evaluation_listener", ":runtime_helper", ":unknown_attributes", - "//:auto_value", "//common", "//common:error_codes", "//common:features", @@ -148,10 +148,10 @@ java_library( tags = [ ], deps = [ + ":auto_value", ":evaluation_listener", ":runtime_type_provider_legacy", ":unknown_attributes", - "//:auto_value", "//common", "//common:error_codes", "//common:options", @@ -208,7 +208,7 @@ java_library( tags = [ ], deps = [ - "//:auto_value", + ":auto_value", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", "@maven//:com_google_re2j_re2j", diff --git a/runtime/src/main/java/dev/cel/runtime/async/BUILD.bazel b/runtime/src/main/java/dev/cel/runtime/async/BUILD.bazel index 8e2042bc9..070e4df66 100644 --- a/runtime/src/main/java/dev/cel/runtime/async/BUILD.bazel +++ b/runtime/src/main/java/dev/cel/runtime/async/BUILD.bazel @@ -23,7 +23,7 @@ java_library( name = "async", srcs = ASYNC_RUNTIME_SOURCES, deps = [ - "//:auto_value", + ":auto_value", "//common", "//runtime", "//runtime:unknown_attributes", diff --git a/runtime/src/test/java/dev/cel/runtime/BUILD.bazel b/runtime/src/test/java/dev/cel/runtime/BUILD.bazel index fea8d6e43..8fd2e1f79 100644 --- a/runtime/src/test/java/dev/cel/runtime/BUILD.bazel +++ b/runtime/src/test/java/dev/cel/runtime/BUILD.bazel @@ -13,8 +13,8 @@ java_library( ], ), deps = [ - "//:auto_value", - "//:java_truth", + ":auto_value", + ":java_truth", "//bundle:cel", "//common", "//common:error_codes", diff --git a/runtime/src/test/java/dev/cel/runtime/async/BUILD.bazel b/runtime/src/test/java/dev/cel/runtime/async/BUILD.bazel index 599a76835..7ddf4dcea 100644 --- a/runtime/src/test/java/dev/cel/runtime/async/BUILD.bazel +++ b/runtime/src/test/java/dev/cel/runtime/async/BUILD.bazel @@ -9,7 +9,7 @@ java_library( testonly = True, srcs = glob(["*Test.java"]), deps = [ - "//:java_truth", + ":java_truth", "//bundle:cel", "//common", "//common:options", diff --git a/testing/src/main/java/dev/cel/testing/BUILD.bazel b/testing/src/main/java/dev/cel/testing/BUILD.bazel index f641dd56f..f1237eddd 100644 --- a/testing/src/main/java/dev/cel/testing/BUILD.bazel +++ b/testing/src/main/java/dev/cel/testing/BUILD.bazel @@ -28,7 +28,7 @@ java_library( name = "line_differ", srcs = ["LineDiffer.java"], deps = [ - "//:auto_value", + ":auto_value", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", ], @@ -64,8 +64,8 @@ java_library( srcs = ["CelBaselineTestCase.java"], deps = [ ":baseline_test_case", + ":java_truth", ":test_decls", - "//:java_truth", "//common", "//common:compiler_common", "//common:options", @@ -145,7 +145,7 @@ java_library( deps = [ ":cel_baseline_test_case", ":eval", - "//:java_truth", + ":java_truth", "//common", "//common/internal:cel_descriptor_pools", "//common/resources/testdata/proto3:standalone_global_enum_java_proto", diff --git a/testing/src/test/java/dev/cel/testing/BUILD.bazel b/testing/src/test/java/dev/cel/testing/BUILD.bazel index 4d4a12ec4..60108cff6 100644 --- a/testing/src/test/java/dev/cel/testing/BUILD.bazel +++ b/testing/src/test/java/dev/cel/testing/BUILD.bazel @@ -9,7 +9,7 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//common", "//common:options", "//common/types", diff --git a/validator/src/test/java/dev/cel/validator/BUILD.bazel b/validator/src/test/java/dev/cel/validator/BUILD.bazel index f6f94f625..4e3961131 100644 --- a/validator/src/test/java/dev/cel/validator/BUILD.bazel +++ b/validator/src/test/java/dev/cel/validator/BUILD.bazel @@ -7,7 +7,7 @@ java_library( testonly = 1, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//bundle:cel", "//common:compiler_common", "//compiler", diff --git a/validator/src/test/java/dev/cel/validator/validators/BUILD.bazel b/validator/src/test/java/dev/cel/validator/validators/BUILD.bazel index eca252aa9..329566a34 100644 --- a/validator/src/test/java/dev/cel/validator/validators/BUILD.bazel +++ b/validator/src/test/java/dev/cel/validator/validators/BUILD.bazel @@ -7,7 +7,7 @@ java_library( testonly = 1, srcs = glob(["*.java"]), deps = [ - "//:java_truth", + ":java_truth", "//bundle:cel", "//common", "//common:compiler_common",