diff --git a/bundle/src/main/java/dev/cel/bundle/BUILD.bazel b/bundle/src/main/java/dev/cel/bundle/BUILD.bazel index 32c9fe9d1..ed401a042 100644 --- a/bundle/src/main/java/dev/cel/bundle/BUILD.bazel +++ b/bundle/src/main/java/dev/cel/bundle/BUILD.bazel @@ -25,7 +25,8 @@ java_library( "//checker:checker_builder", "//checker:checker_legacy_environment", "//checker:proto_type_mask", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:options", "//common/internal:env_visitor", diff --git a/bundle/src/test/java/dev/cel/bundle/BUILD.bazel b/bundle/src/test/java/dev/cel/bundle/BUILD.bazel index b9afb5405..24ca0a484 100644 --- a/bundle/src/test/java/dev/cel/bundle/BUILD.bazel +++ b/bundle/src/test/java/dev/cel/bundle/BUILD.bazel @@ -21,7 +21,8 @@ java_library( "//checker", "//checker:checker_legacy_environment", "//checker:proto_type_mask", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:error_codes", "//common:options", diff --git a/checker/src/main/java/dev/cel/checker/BUILD.bazel b/checker/src/main/java/dev/cel/checker/BUILD.bazel index 4e0530f25..10a6de247 100644 --- a/checker/src/main/java/dev/cel/checker/BUILD.bazel +++ b/checker/src/main/java/dev/cel/checker/BUILD.bazel @@ -72,7 +72,9 @@ java_library( ":standard_decl", ":type_provider_legacy_impl", "//:auto_value", - "//common", + "//common:cel_ast", + "//common:cel_descriptors", + "//common:cel_source", "//common:compiler_common", "//common:options", "//common:source_location", @@ -100,7 +102,7 @@ java_library( ":checker_legacy_environment", ":proto_type_mask", ":standard_decl", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:options", "//common/types:type_providers", @@ -171,7 +173,7 @@ java_library( ":cel_ident_decl", ":standard_decl", "//:auto_value", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:options", "//common:proto_ast", @@ -218,7 +220,7 @@ java_library( ], deps = [ ":checker_legacy_environment", - "//common", + "//common:cel_ast", "//common:proto_ast", ], ) diff --git a/checker/src/test/java/dev/cel/checker/BUILD.bazel b/checker/src/test/java/dev/cel/checker/BUILD.bazel index f2ab8e599..874a7e8a5 100644 --- a/checker/src/test/java/dev/cel/checker/BUILD.bazel +++ b/checker/src/test/java/dev/cel/checker/BUILD.bazel @@ -22,7 +22,8 @@ java_library( "//checker:standard_decl", "//checker:type_inferencer", "//checker:type_provider_legacy_impl", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:options", "//common:proto_ast", diff --git a/codelab/src/main/codelab/BUILD.bazel b/codelab/src/main/codelab/BUILD.bazel index adeb3b5dd..5f1e3ca56 100644 --- a/codelab/src/main/codelab/BUILD.bazel +++ b/codelab/src/main/codelab/BUILD.bazel @@ -12,7 +12,7 @@ java_library( srcs = glob(["*.java"]), deps = [ "//bundle:cel", # unuseddeps: keep - "//common", # unuseddeps: keep + "//common:cel_ast", "//common:compiler_common", # unuseddeps: keep "//common:proto_json_adapter", # unuseddeps: keep "//common/ast", # unuseddeps: keep diff --git a/codelab/src/main/codelab/solutions/BUILD.bazel b/codelab/src/main/codelab/solutions/BUILD.bazel index c94072fb3..dd70c268f 100644 --- a/codelab/src/main/codelab/solutions/BUILD.bazel +++ b/codelab/src/main/codelab/solutions/BUILD.bazel @@ -12,7 +12,7 @@ java_library( srcs = glob(["*.java"]), deps = [ "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:proto_json_adapter", "//common/ast", diff --git a/codelab/src/test/codelab/BUILD.bazel b/codelab/src/test/codelab/BUILD.bazel index 0cfccfcaa..82ac34677 100644 --- a/codelab/src/test/codelab/BUILD.bazel +++ b/codelab/src/test/codelab/BUILD.bazel @@ -12,7 +12,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "//compiler", "//compiler:compiler_builder", "@maven//:junit_junit", @@ -27,7 +27,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "//common/types", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_guava_guava", @@ -59,7 +59,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", @@ -76,7 +76,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java_util", "@maven//:com_google_testparameterinjector_test_parameter_injector", @@ -92,7 +92,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", @@ -110,7 +110,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "@maven//:com_google_guava_guava", "@maven//:com_google_testparameterinjector_test_parameter_injector", "@maven//:junit_junit", @@ -125,7 +125,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "//common:compiler_common", "//parser:unparser", "//runtime", @@ -144,7 +144,7 @@ java_test( deps = [ "//:java_truth", "//codelab", - "//common", + "//common:cel_ast", "//common:compiler_common", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_testparameterinjector_test_parameter_injector", diff --git a/codelab/src/test/codelab/solutions/BUILD.bazel b/codelab/src/test/codelab/solutions/BUILD.bazel index 09e89dc51..676559605 100644 --- a/codelab/src/test/codelab/solutions/BUILD.bazel +++ b/codelab/src/test/codelab/solutions/BUILD.bazel @@ -11,7 +11,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "//compiler", "//compiler:compiler_builder", "@maven//:junit_junit", @@ -25,7 +25,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "//common/types", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_guava_guava", @@ -55,7 +55,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", @@ -71,7 +71,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java_util", "@maven//:com_google_testparameterinjector_test_parameter_injector", @@ -86,7 +86,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", @@ -103,7 +103,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "@maven//:com_google_guava_guava", "@maven//:com_google_testparameterinjector_test_parameter_injector", "@maven//:junit_junit", @@ -117,7 +117,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "//common:compiler_common", "//parser:unparser", "//runtime", @@ -135,7 +135,7 @@ java_test( deps = [ "//:java_truth", "//codelab:solutions", - "//common", + "//common:cel_ast", "//common:compiler_common", "@com_google_googleapis//google/rpc/context:attribute_context_java_proto", "@maven//:com_google_testparameterinjector_test_parameter_injector", diff --git a/common/src/main/java/dev/cel/common/BUILD.bazel b/common/src/main/java/dev/cel/common/BUILD.bazel index 82d2512fb..10900f0e4 100644 --- a/common/src/main/java/dev/cel/common/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/BUILD.bazel @@ -108,7 +108,8 @@ java_library( deps = [ ":cel_ast", ":cel_source", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common/ast:expr_converter", "//common/types:cel_proto_types", "@cel_spec//proto/cel/expr:checked_java_proto", @@ -180,7 +181,7 @@ java_library( deps = [ ":cel_ast", ":mutable_source", - "//common", + "//common:cel_ast", "//common/ast", "//common/ast:mutable_expr", "//common/types:type_providers", 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 a2ebdbdd1..a99d0872c 100644 --- a/common/src/main/java/dev/cel/common/ast/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/ast/BUILD.bazel @@ -101,7 +101,7 @@ java_library( ], deps = [ ":ast", - "//common", + "//common:cel_ast", ], ) 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 2e8bd7aa8..bca6ec303 100644 --- a/common/src/main/java/dev/cel/common/internal/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/internal/BUILD.bazel @@ -283,7 +283,7 @@ java_library( ], deps = [ ":well_known_proto", - "//common", + "//common:cel_descriptors", "//common/annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", 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 2c5a80fe7..b43f3c289 100644 --- a/common/src/main/java/dev/cel/common/navigation/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/navigation/BUILD.bazel @@ -39,7 +39,7 @@ java_library( deps = [ ":common", "//:auto_value", - "//common", + "//common:cel_ast", "//common/ast", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", 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 69368e2f2..ccb72f9e5 100644 --- a/common/src/main/java/dev/cel/common/types/BUILD.bazel +++ b/common/src/main/java/dev/cel/common/types/BUILD.bazel @@ -174,7 +174,7 @@ java_library( ":type_providers", ":types", "//:auto_value", - "//common", + "//common:cel_descriptors", "//common/internal:file_descriptor_converter", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", diff --git a/common/src/test/java/dev/cel/common/BUILD.bazel b/common/src/test/java/dev/cel/common/BUILD.bazel index f076e8142..de0d1d079 100644 --- a/common/src/test/java/dev/cel/common/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/BUILD.bazel @@ -11,7 +11,9 @@ java_library( srcs = glob(["*.java"]), deps = [ "//:java_truth", - "//common", + "//common:cel_ast", + "//common:cel_descriptors", + "//common:cel_source", "//common:compiler_common", "//common:options", "//common:proto_ast", 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 79d632a8e..3e2d87cee 100644 --- a/common/src/test/java/dev/cel/common/ast/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/ast/BUILD.bazel @@ -12,7 +12,7 @@ java_library( deps = [ "//:auto_value", "//:java_truth", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:mutable_ast", "//common:mutable_source", 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 025db96b8..efbe5e7d2 100644 --- a/common/src/test/java/dev/cel/common/internal/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/internal/BUILD.bazel @@ -13,7 +13,7 @@ java_library( deps = [ "//:auto_value", "//:java_truth", - "//common", + "//common:cel_descriptors", "//common:options", "//common/ast", "//common/internal", 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 d1219c9c1..2a0fa4bfb 100644 --- a/common/src/test/java/dev/cel/common/navigation/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/navigation/BUILD.bazel @@ -9,7 +9,7 @@ java_library( srcs = glob(["*.java"]), deps = [ "//:java_truth", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:mutable_ast", "//common:options", 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 b7a8dc60e..a4e8e51c2 100644 --- a/common/src/test/java/dev/cel/common/values/BUILD.bazel +++ b/common/src/test/java/dev/cel/common/values/BUILD.bazel @@ -10,7 +10,8 @@ java_library( deps = [ "//:java_truth", "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_descriptors", "//common:options", "//common:runtime_exception", "//common/internal:cel_descriptor_pools", diff --git a/compiler/src/main/java/dev/cel/compiler/BUILD.bazel b/compiler/src/main/java/dev/cel/compiler/BUILD.bazel index f14acd97c..cbb8815bf 100644 --- a/compiler/src/main/java/dev/cel/compiler/BUILD.bazel +++ b/compiler/src/main/java/dev/cel/compiler/BUILD.bazel @@ -35,7 +35,8 @@ java_library( "//checker:checker_legacy_environment", "//checker:proto_type_mask", "//checker:standard_decl", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:options", "//common/annotations", diff --git a/compiler/src/main/java/dev/cel/compiler/tools/BUILD.bazel b/compiler/src/main/java/dev/cel/compiler/tools/BUILD.bazel index 9d184043b..aa10b1324 100644 --- a/compiler/src/main/java/dev/cel/compiler/tools/BUILD.bazel +++ b/compiler/src/main/java/dev/cel/compiler/tools/BUILD.bazel @@ -18,7 +18,8 @@ java_binary( "//bundle:environment", "//bundle:environment_exception", "//bundle:environment_yaml_parser", - "//common", + "//common:cel_ast", + "//common:cel_descriptors", "//common:options", "//common:proto_ast", "//compiler", diff --git a/extensions/src/test/java/dev/cel/extensions/BUILD.bazel b/extensions/src/test/java/dev/cel/extensions/BUILD.bazel index cb14e97eb..23848d4e3 100644 --- a/extensions/src/test/java/dev/cel/extensions/BUILD.bazel +++ b/extensions/src/test/java/dev/cel/extensions/BUILD.bazel @@ -10,7 +10,7 @@ java_library( deps = [ "//:java_truth", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:options", "//common/types", diff --git a/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel b/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel index af01d1a1c..e9e8994a2 100644 --- a/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel +++ b/optimizer/src/main/java/dev/cel/optimizer/BUILD.bazel @@ -38,7 +38,7 @@ java_library( deps = [ ":ast_optimizer", ":optimization_exception", - "//common", + "//common:cel_ast", "@maven//:com_google_errorprone_error_prone_annotations", ], ) @@ -55,7 +55,7 @@ java_library( ":optimization_exception", ":optimizer_builder", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "@maven//:com_google_guava_guava", ], @@ -70,7 +70,7 @@ java_library( ":optimization_exception", "//:auto_value", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "@maven//:com_google_guava_guava", ], @@ -86,7 +86,7 @@ java_library( ], deps = [ "//:auto_value", - "//common", + "//common:cel_ast", "//common:mutable_ast", "//common:mutable_source", "//common/annotations", 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 8a27272ca..7728c0ac8 100644 --- a/optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel +++ b/optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel @@ -19,7 +19,8 @@ java_library( ":default_optimizer_constants", "//:auto_value", "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:mutable_ast", "//common/ast", @@ -47,7 +48,8 @@ java_library( ":default_optimizer_constants", "//:auto_value", "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:mutable_ast", "//common:mutable_source", diff --git a/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel b/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel index 95aadf004..4c8e4bd48 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel +++ b/optimizer/src/test/java/dev/cel/optimizer/BUILD.bazel @@ -10,7 +10,8 @@ java_library( deps = [ "//:java_truth", "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:mutable_ast", "//common:options", 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 37e2af3b3..a65404d26 100644 --- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel +++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel @@ -11,7 +11,8 @@ java_library( deps = [ # "//java/com/google/testing/testsize:annotations", "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:mutable_ast", "//common:options", diff --git a/parser/src/main/java/dev/cel/parser/BUILD.bazel b/parser/src/main/java/dev/cel/parser/BUILD.bazel index 6a002ca4a..f01690423 100644 --- a/parser/src/main/java/dev/cel/parser/BUILD.bazel +++ b/parser/src/main/java/dev/cel/parser/BUILD.bazel @@ -58,7 +58,8 @@ java_library( ":macro", ":operator", ":parser_builder", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:options", "//common:source_location", @@ -79,7 +80,7 @@ java_library( ], deps = [ ":macro", - "//common", + "//common:cel_source", "//common:compiler_common", "//common:options", "@maven//:com_google_errorprone_error_prone_annotations", @@ -121,7 +122,7 @@ java_library( ], deps = [ ":unparser_visitor", - "//common", + "//common:cel_ast", "//common:options", ], ) @@ -133,7 +134,8 @@ java_library( ], deps = [ ":operator", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common/ast", "//common/ast:cel_expr_visitor", "@maven//:com_google_guava_guava", diff --git a/parser/src/test/java/dev/cel/parser/BUILD.bazel b/parser/src/test/java/dev/cel/parser/BUILD.bazel index 0eb32c08f..a93dc780e 100644 --- a/parser/src/test/java/dev/cel/parser/BUILD.bazel +++ b/parser/src/test/java/dev/cel/parser/BUILD.bazel @@ -13,7 +13,8 @@ java_library( deps = [ "//:auto_value", "//:java_truth", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:options", "//common:proto_ast", diff --git a/policy/src/main/java/dev/cel/policy/BUILD.bazel b/policy/src/main/java/dev/cel/policy/BUILD.bazel index b43065de4..7c5411cae 100644 --- a/policy/src/main/java/dev/cel/policy/BUILD.bazel +++ b/policy/src/main/java/dev/cel/policy/BUILD.bazel @@ -123,7 +123,7 @@ java_library( ":compiled_rule", ":policy", ":validation_exception", - "//common", + "//common:cel_ast", ], ) @@ -176,7 +176,7 @@ java_library( deps = [ "//:auto_value", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common/ast", "//common/formats:value_string", @@ -200,7 +200,8 @@ java_library( ":source", ":validation_exception", "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common:source_location", "//common/ast", @@ -239,7 +240,7 @@ java_library( ":compiled_rule", "//:auto_value", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:mutable_ast", "//common/formats:value_string", diff --git a/policy/src/test/java/dev/cel/policy/BUILD.bazel b/policy/src/test/java/dev/cel/policy/BUILD.bazel index 6dd8c58f3..4c6e260f5 100644 --- a/policy/src/test/java/dev/cel/policy/BUILD.bazel +++ b/policy/src/test/java/dev/cel/policy/BUILD.bazel @@ -15,7 +15,7 @@ java_library( "//bundle:cel", "//bundle:environment", "//bundle:environment_yaml_parser", - "//common", + "//common:cel_ast", "//common:options", "//common/formats:value_string", "//common/internal", diff --git a/runtime/src/main/java/dev/cel/runtime/BUILD.bazel b/runtime/src/main/java/dev/cel/runtime/BUILD.bazel index 9cd594317..e4c4dbbc5 100644 --- a/runtime/src/main/java/dev/cel/runtime/BUILD.bazel +++ b/runtime/src/main/java/dev/cel/runtime/BUILD.bazel @@ -92,7 +92,7 @@ java_library( ], deps = [ ":runtime_type_provider", - "//common", + "//common:cel_descriptors", "//common:error_codes", "//common:options", "//common:runtime_exception", @@ -284,7 +284,7 @@ java_library( ":type_resolver", ":unknown_attributes", "//:auto_value", - "//common", + "//common:cel_ast", "//common:error_codes", "//common:options", "//common:runtime_exception", @@ -662,7 +662,8 @@ java_library( ":standard_functions", ":unknown_attributes", "//:auto_value", - "//common", + "//common:cel_ast", + "//common:cel_descriptors", "//common:options", "//common/annotations", "//common/internal:cel_descriptor_pools", @@ -801,7 +802,7 @@ java_library( ], deps = [ ":unknown_attributes", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common/ast", "//parser:operator", 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 4e481b963..e84c1534f 100644 --- a/runtime/src/main/java/dev/cel/runtime/async/BUILD.bazel +++ b/runtime/src/main/java/dev/cel/runtime/async/BUILD.bazel @@ -26,7 +26,7 @@ java_library( srcs = ASYNC_RUNTIME_SOURCES, deps = [ "//:auto_value", - "//common", + "//common:cel_ast", "//runtime", "//runtime:unknown_attributes", "@maven//:com_google_code_findbugs_annotations", diff --git a/runtime/src/test/java/dev/cel/runtime/BUILD.bazel b/runtime/src/test/java/dev/cel/runtime/BUILD.bazel index d25d82f7c..0f568b720 100644 --- a/runtime/src/test/java/dev/cel/runtime/BUILD.bazel +++ b/runtime/src/test/java/dev/cel/runtime/BUILD.bazel @@ -68,7 +68,10 @@ java_library( "//:auto_value", "//:java_truth", "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_descriptors", + "//common:cel_exception", + "//common:cel_source", "//common:error_codes", "//common:options", "//common:proto_ast", 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 e242afbed..49b5dfca0 100644 --- a/runtime/src/test/java/dev/cel/runtime/async/BUILD.bazel +++ b/runtime/src/test/java/dev/cel/runtime/async/BUILD.bazel @@ -12,7 +12,7 @@ java_library( deps = [ # "//java/com/google/testing/testsize:annotations", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:options", "//common/testing", "//common/types", diff --git a/testing/src/main/java/dev/cel/testing/BUILD.bazel b/testing/src/main/java/dev/cel/testing/BUILD.bazel index 0869c4e42..1923807f4 100644 --- a/testing/src/main/java/dev/cel/testing/BUILD.bazel +++ b/testing/src/main/java/dev/cel/testing/BUILD.bazel @@ -68,7 +68,7 @@ java_library( ":baseline_test_case", ":test_decls", "//:java_truth", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:options", "//common/types:cel_proto_types", @@ -97,7 +97,7 @@ java_library( deps = [ ":cel_baseline_test_case", "//:java_truth", - "//common", + "//common:cel_ast", "//common:options", "//common:proto_ast", "//common/internal:cel_descriptor_pools", diff --git a/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel b/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel index 6c4d4479e..d511b95ba 100644 --- a/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel +++ b/testing/src/main/java/dev/cel/testing/utils/BUILD.bazel @@ -14,7 +14,7 @@ java_library( tags = [ ], deps = [ - "//common", + "//common:cel_descriptors", "//common/internal:default_instance_message_factory", "//common/types", "//common/types:type_providers", diff --git a/validator/src/main/java/dev/cel/validator/BUILD.bazel b/validator/src/main/java/dev/cel/validator/BUILD.bazel index c6cad795b..c9dd20575 100644 --- a/validator/src/main/java/dev/cel/validator/BUILD.bazel +++ b/validator/src/main/java/dev/cel/validator/BUILD.bazel @@ -37,7 +37,7 @@ java_library( ], deps = [ ":ast_validator", - "//common", + "//common:cel_ast", "//common:compiler_common", "@maven//:com_google_errorprone_error_prone_annotations", ], @@ -54,7 +54,7 @@ java_library( ":ast_validator", ":validator_builder", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common/navigation", "@maven//:com_google_guava_guava", @@ -68,7 +68,7 @@ java_library( ], deps = [ "//bundle:cel", - "//common", + "//common:cel_source", "//common:compiler_common", "//common:source_location", "//common/navigation", diff --git a/validator/src/main/java/dev/cel/validator/validators/BUILD.bazel b/validator/src/main/java/dev/cel/validator/validators/BUILD.bazel index 7eac3967f..b7050466c 100644 --- a/validator/src/main/java/dev/cel/validator/validators/BUILD.bazel +++ b/validator/src/main/java/dev/cel/validator/validators/BUILD.bazel @@ -59,7 +59,7 @@ java_library( ], deps = [ "//bundle:cel", - "//common", + "//common:cel_ast", "//common/ast", "//common/navigation", "//common/types:cel_types", @@ -92,7 +92,8 @@ java_library( visibility = ["//visibility:private"], deps = [ "//bundle:cel", - "//common", + "//common:cel_ast", + "//common:cel_source", "//common:compiler_common", "//common/ast", "//common/ast:expr_factory", 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 59297da4d..3cf20ebb6 100644 --- a/validator/src/test/java/dev/cel/validator/validators/BUILD.bazel +++ b/validator/src/test/java/dev/cel/validator/validators/BUILD.bazel @@ -10,7 +10,7 @@ java_library( deps = [ "//:java_truth", "//bundle:cel", - "//common", + "//common:cel_ast", "//common:compiler_common", "//common:options", "//common:proto_ast",