Internal Changes

PiperOrigin-RevId: 746242496

Author: l46kok

BUILD.bazel

@@ -105,6 +105,8 @@ java_package_configuration(
     name = "error_prone",
     # keep sorted
     javacopts = [
+        "-XepDisableWarningsInGeneratedCode",
+        "-XepExcludedPaths:.*/bazel-out/.*",
         "-Xep:AmbiguousMethodReference:ERROR",
         "-Xep:BadAnnotationImplementation:ERROR",
         "-Xep:BadComparable:ERROR",
@@ -151,7 +153,7 @@ java_package_configuration(
         "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR",
         "-Xep:ProtocolBufferOrdinal:ERROR",
         "-Xep:ReferenceEquality:ERROR",
-        "-Xep:RemoveUnusedImports:ERROR",
+        #        "-Xep:RemoveUnusedImports:ERROR",
         "-Xep:RequiredModifiers:ERROR",
         "-Xep:ShortCircuitBoolean:ERROR",
         "-Xep:SimpleDateFormatConstant:ERROR",
@@ -167,8 +169,6 @@ java_package_configuration(
         "-Xep:UnusedVariable:ERROR",
         "-Xep:WaitNotInLoop:ERROR",
         "-Xep:WildcardImport:ERROR",
-        "-XepDisableWarningsInGeneratedCode",
-        "-XepExcludedPaths:.*/bazel-out/.*",
     ],
     packages = ["error_prone_packages"],
 )

WORKSPACE

@@ -242,11 +242,11 @@ http_archive(
 )
 
 # cel-spec api/expr canonical protos
-CEL_SPEC_VERSION = "0.20.0"
+CEL_SPEC_VERSION = "0.22.1"
 
 http_archive(
     name = "cel_spec",
-    sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
+    sha256 = "1f1ad32bce5d31cf82e9c8f40685b1902de3ab07c78403601e7a43c3fb4de9a6",
     strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
     urls = [
         "https://github.com/google/cel-spec/archive/" +

bundle/src/test/java/dev/cel/bundle/BUILD.bazel

@@ -59,6 +59,7 @@ java_library(
         "@maven//:com_google_truth_extensions_truth_proto_extension",
         "@maven//:junit_junit",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

bundle/src/test/java/dev/cel/bundle/CelImplTest.java

@@ -320,7 +320,6 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
 
   @Test
   public void compile_customTypesWithAliasingSelfContainedProvider() throws Exception {
-
     // The custom type provider sets up an alias from "Condition" to "google.type.Expr".
     TypeProvider customTypeProvider =
         aliasingProvider(
@@ -409,6 +408,7 @@ public void program_setTypeFactoryOnAnyPackedMessage_messageConstructionSucceeds
   }
 
   @Test
+  @SuppressWarnings("unused")
   public void program_concurrentMessageConstruction_succeeds(
       @TestParameter(valuesProvider = RepeatedTestProvider.class) int testRunIndex)
       throws Exception {

cel_android_rules.bzl

@@ -31,10 +31,15 @@ def cel_android_library(name, **kwargs):
     javacopts = kwargs.get("javacopts", [])
     all_javacopts = DEFAULT_JAVACOPTS + javacopts
 
+    # By default, set visibility to android_allow_list, unless if overridden at the call site.
+    provided_visibility_or_default = kwargs.get("visibility", ["//:android_allow_list"])
+    filtered_kwargs = {k: v for k, v in kwargs.items() if k != "visibility"}
+
     android_library(
         name = name,
+        visibility = provided_visibility_or_default,
         javacopts = all_javacopts,
-        **kwargs
+        **filtered_kwargs
     )
 
 def cel_android_local_test(name, **kwargs):

codelab/src/main/codelab/BUILD.bazel

@@ -39,5 +39,6 @@ java_library(
         "@maven//:com_google_guava_guava",  # unuseddeps: keep
         "@maven//:com_google_protobuf_protobuf_java",  # unuseddeps: keep
         "@maven//:com_google_protobuf_protobuf_java_util",  # unuseddeps: keep
+        "@maven_android//:com_google_protobuf_protobuf_javalite",  # unuseddeps: keep
     ],
 )

codelab/src/main/codelab/solutions/BUILD.bazel

@@ -40,5 +40,6 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )

common/BUILD.bazel

@@ -24,7 +24,6 @@ java_library(
 
 cel_android_library(
     name = "proto_ast_android",
-    visibility = ["//:android_allow_list"],
     exports = ["//common/src/main/java/dev/cel/common:proto_ast_android"],
 )
 
@@ -80,7 +79,6 @@ java_library(
 
 cel_android_library(
     name = "cel_source_android",
-    visibility = ["//:android_allow_list"],
     exports = ["//common/src/main/java/dev/cel/common:cel_source_android"],
 )
 
@@ -91,7 +89,6 @@ java_library(
 
 cel_android_library(
     name = "cel_ast_android",
-    visibility = ["//:android_allow_list"],
     exports = [
         "//common/src/main/java/dev/cel/common:cel_ast_android",
     ],

common/ast/BUILD.bazel

@@ -13,7 +13,6 @@ java_library(
 
 cel_android_library(
     name = "ast_android",
-    visibility = ["//:android_allow_list"],
     exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
 )
 
@@ -24,7 +23,6 @@ java_library(
 
 cel_android_library(
     name = "expr_converter_android",
-    visibility = ["//:android_allow_list"],
     exports = ["//common/src/main/java/dev/cel/common/ast:expr_converter_android"],
 )
 

common/internal/BUILD.bazel

@@ -72,6 +72,11 @@ java_library(
     exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto"],
 )
 
+cel_android_library(
+    name = "well_known_proto_android",
+    exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto_android"],
+)
+
 java_library(
     name = "proto_message_factory",
     exports = ["//common/src/main/java/dev/cel/common/internal:proto_message_factory"],
@@ -87,6 +92,26 @@ java_library(
     exports = ["//common/src/main/java/dev/cel/common/internal:cel_descriptor_pools"],
 )
 
+java_library(
+    name = "cel_lite_descriptor_pool",
+    exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
+)
+
+cel_android_library(
+    name = "cel_lite_descriptor_pool_android",
+    exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool_android"],
+)
+
+java_library(
+    name = "default_lite_descriptor_pool",
+    exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
+)
+
+cel_android_library(
+    name = "default_lite_descriptor_pool_android",
+    exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool_android"],
+)
+
 java_library(
     name = "safe_string_formatter",
     # used_by_android
@@ -95,6 +120,16 @@ java_library(
 
 cel_android_library(
     name = "internal_android",
-    visibility = ["//:android_allow_list"],
     exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
 )
+
+java_library(
+    name = "proto_java_qualified_names",
+    exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
+)
+
+java_library(
+    name = "reflection_util",
+    # used_by_android
+    exports = ["//common/src/main/java/dev/cel/common/internal:reflection_util"],
+)