Skip to content

Commit 8018f4f

Browse files
l46kokcopybara-github
l46kok
authored and
copybara-github
committed
Internal Changes
PiperOrigin-RevId: 746242496
1 parent 297928e commit 8018f4f

File tree

87 files changed

+4409
-612
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+4409
-612
lines changed

‎BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ java_package_configuration(
105105
name = "error_prone",
106106
# keep sorted
107107
javacopts = [
108+
"-XepDisableWarningsInGeneratedCode",
109+
"-XepExcludedPaths:.*/bazel-out/.*",
108110
"-Xep:AmbiguousMethodReference:ERROR",
109111
"-Xep:BadAnnotationImplementation:ERROR",
110112
"-Xep:BadComparable:ERROR",
@@ -151,7 +153,7 @@ java_package_configuration(
151153
"-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR",
152154
"-Xep:ProtocolBufferOrdinal:ERROR",
153155
"-Xep:ReferenceEquality:ERROR",
154-
"-Xep:RemoveUnusedImports:ERROR",
156+
# "-Xep:RemoveUnusedImports:ERROR",
155157
"-Xep:RequiredModifiers:ERROR",
156158
"-Xep:ShortCircuitBoolean:ERROR",
157159
"-Xep:SimpleDateFormatConstant:ERROR",
@@ -167,8 +169,6 @@ java_package_configuration(
167169
"-Xep:UnusedVariable:ERROR",
168170
"-Xep:WaitNotInLoop:ERROR",
169171
"-Xep:WildcardImport:ERROR",
170-
"-XepDisableWarningsInGeneratedCode",
171-
"-XepExcludedPaths:.*/bazel-out/.*",
172172
],
173173
packages = ["error_prone_packages"],
174174
)

‎WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,11 @@ http_archive(
242242
)
243243

244244
# cel-spec api/expr canonical protos
245-
CEL_SPEC_VERSION = "0.20.0"
245+
CEL_SPEC_VERSION = "0.22.1"
246246

247247
http_archive(
248248
name = "cel_spec",
249-
sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
249+
sha256 = "1f1ad32bce5d31cf82e9c8f40685b1902de3ab07c78403601e7a43c3fb4de9a6",
250250
strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
251251
urls = [
252252
"https://github.com/google/cel-spec/archive/" +

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ java_library(
5959
"@maven//:com_google_truth_extensions_truth_proto_extension",
6060
"@maven//:junit_junit",
6161
"@maven//:org_jspecify_jspecify",
62+
"@maven_android//:com_google_protobuf_protobuf_javalite",
6263
],
6364
)
6465

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ public void compile_customTypesWithAliasingCombinedProviders() throws Exception
320320

321321
@Test
322322
public void compile_customTypesWithAliasingSelfContainedProvider() throws Exception {
323-
324323
// The custom type provider sets up an alias from "Condition" to "google.type.Expr".
325324
TypeProvider customTypeProvider =
326325
aliasingProvider(
@@ -409,6 +408,7 @@ public void program_setTypeFactoryOnAnyPackedMessage_messageConstructionSucceeds
409408
}
410409

411410
@Test
411+
@SuppressWarnings("unused")
412412
public void program_concurrentMessageConstruction_succeeds(
413413
@TestParameter(valuesProvider = RepeatedTestProvider.class) int testRunIndex)
414414
throws Exception {

‎cel_android_rules.bzl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ def cel_android_library(name, **kwargs):
3131
javacopts = kwargs.get("javacopts", [])
3232
all_javacopts = DEFAULT_JAVACOPTS + javacopts
3333

34+
# By default, set visibility to android_allow_list, unless if overridden at the call site.
35+
provided_visibility_or_default = kwargs.get("visibility", ["//:android_allow_list"])
36+
filtered_kwargs = {k: v for k, v in kwargs.items() if k != "visibility"}
37+
3438
android_library(
3539
name = name,
40+
visibility = provided_visibility_or_default,
3641
javacopts = all_javacopts,
37-
**kwargs
42+
**filtered_kwargs
3843
)
3944

4045
def cel_android_local_test(name, **kwargs):

‎codelab/src/main/codelab/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ java_library(
3939
"@maven//:com_google_guava_guava", # unuseddeps: keep
4040
"@maven//:com_google_protobuf_protobuf_java", # unuseddeps: keep
4141
"@maven//:com_google_protobuf_protobuf_java_util", # unuseddeps: keep
42+
"@maven_android//:com_google_protobuf_protobuf_javalite", # unuseddeps: keep
4243
],
4344
)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ java_library(
4040
"@maven//:com_google_guava_guava",
4141
"@maven//:com_google_protobuf_protobuf_java",
4242
"@maven//:com_google_protobuf_protobuf_java_util",
43+
"@maven_android//:com_google_protobuf_protobuf_javalite",
4344
],
4445
)

‎common/BUILD.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ java_library(
2424

2525
cel_android_library(
2626
name = "proto_ast_android",
27-
visibility = ["//:android_allow_list"],
2827
exports = ["//common/src/main/java/dev/cel/common:proto_ast_android"],
2928
)
3029

@@ -80,7 +79,6 @@ java_library(
8079

8180
cel_android_library(
8281
name = "cel_source_android",
83-
visibility = ["//:android_allow_list"],
8482
exports = ["//common/src/main/java/dev/cel/common:cel_source_android"],
8583
)
8684

@@ -91,7 +89,6 @@ java_library(
9189

9290
cel_android_library(
9391
name = "cel_ast_android",
94-
visibility = ["//:android_allow_list"],
9592
exports = [
9693
"//common/src/main/java/dev/cel/common:cel_ast_android",
9794
],

‎common/ast/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ java_library(
1313

1414
cel_android_library(
1515
name = "ast_android",
16-
visibility = ["//:android_allow_list"],
1716
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
1817
)
1918

@@ -24,7 +23,6 @@ java_library(
2423

2524
cel_android_library(
2625
name = "expr_converter_android",
27-
visibility = ["//:android_allow_list"],
2826
exports = ["//common/src/main/java/dev/cel/common/ast:expr_converter_android"],
2927
)
3028

‎common/internal/BUILD.bazel

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ java_library(
7272
exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto"],
7373
)
7474

75+
cel_android_library(
76+
name = "well_known_proto_android",
77+
exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto_android"],
78+
)
79+
7580
java_library(
7681
name = "proto_message_factory",
7782
exports = ["//common/src/main/java/dev/cel/common/internal:proto_message_factory"],
@@ -87,6 +92,26 @@ java_library(
8792
exports = ["//common/src/main/java/dev/cel/common/internal:cel_descriptor_pools"],
8893
)
8994

95+
java_library(
96+
name = "cel_lite_descriptor_pool",
97+
exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool"],
98+
)
99+
100+
cel_android_library(
101+
name = "cel_lite_descriptor_pool_android",
102+
exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool_android"],
103+
)
104+
105+
java_library(
106+
name = "default_lite_descriptor_pool",
107+
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool"],
108+
)
109+
110+
cel_android_library(
111+
name = "default_lite_descriptor_pool_android",
112+
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool_android"],
113+
)
114+
90115
java_library(
91116
name = "safe_string_formatter",
92117
# used_by_android
@@ -95,6 +120,16 @@ java_library(
95120

96121
cel_android_library(
97122
name = "internal_android",
98-
visibility = ["//:android_allow_list"],
99123
exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
100124
)
125+
126+
java_library(
127+
name = "proto_java_qualified_names",
128+
exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
129+
)
130+
131+
java_library(
132+
name = "reflection_util",
133+
# used_by_android
134+
exports = ["//common/src/main/java/dev/cel/common/internal:reflection_util"],
135+
)

‎common/src/main/java/dev/cel/common/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ java_library(
208208
"@maven//:com_google_guava_guava",
209209
"@maven//:com_google_protobuf_protobuf_java",
210210
"@maven//:com_google_protobuf_protobuf_java_util",
211+
"@maven_android//:com_google_protobuf_protobuf_javalite",
211212
],
212213
)
213214

‎common/src/main/java/dev/cel/common/ast/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ java_library(
5353
"@maven//:com_google_guava_guava",
5454
"@maven//:com_google_protobuf_protobuf_java",
5555
"@maven//:org_jspecify_jspecify",
56+
"@maven_android//:com_google_protobuf_protobuf_javalite",
5657
],
5758
)
5859

@@ -114,7 +115,7 @@ java_library(
114115
":ast",
115116
"//common/annotations",
116117
"@maven//:com_google_guava_guava",
117-
"@maven//:com_google_protobuf_protobuf_java",
118+
"@maven_android//:com_google_protobuf_protobuf_javalite",
118119
],
119120
)
120121

@@ -138,7 +139,6 @@ cel_android_library(
138139
"//:auto_value",
139140
"//common/annotations",
140141
"@maven//:com_google_errorprone_error_prone_annotations",
141-
"@maven//:com_google_protobuf_protobuf_java",
142142
"@maven//:org_jspecify_jspecify",
143143
"@maven_android//:com_google_guava_guava",
144144
"@maven_android//:com_google_protobuf_protobuf_javalite",

‎common/src/main/java/dev/cel/common/internal/BUILD.bazel

Lines changed: 76 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ java_library(
4747
"@maven//:com_google_guava_guava",
4848
"@maven//:com_google_protobuf_protobuf_java",
4949
"@maven//:org_antlr_antlr4_runtime",
50+
"@maven_android//:com_google_protobuf_protobuf_javalite",
5051
],
5152
)
5253

@@ -61,7 +62,6 @@ cel_android_library(
6162
"//common/ast:ast_android",
6263
"@maven//:com_google_errorprone_error_prone_annotations",
6364
"@maven//:com_google_guava_guava",
64-
"@maven//:com_google_protobuf_protobuf_java",
6565
"@maven//:org_antlr_antlr4_runtime",
6666
"@maven_android//:com_google_guava_guava",
6767
"@maven_android//:com_google_protobuf_protobuf_javalite",
@@ -140,6 +140,7 @@ java_library(
140140
":proto_java_qualified_names",
141141
"//common/annotations",
142142
"@maven//:com_google_protobuf_protobuf_java",
143+
"@maven_android//:com_google_protobuf_protobuf_javalite",
143144
],
144145
)
145146

@@ -152,7 +153,7 @@ java_library(
152153
":reflection_util",
153154
"//common/annotations",
154155
"@maven//:com_google_guava_guava",
155-
"@maven//:com_google_protobuf_protobuf_java",
156+
"@maven_android//:com_google_protobuf_protobuf_javalite",
156157
],
157158
)
158159

@@ -174,6 +175,7 @@ java_library(
174175
"@maven//:com_google_errorprone_error_prone_annotations",
175176
"@maven//:com_google_guava_guava",
176177
"@maven//:com_google_protobuf_protobuf_java",
178+
"@maven_android//:com_google_protobuf_protobuf_javalite",
177179
],
178180
)
179181

@@ -191,6 +193,7 @@ java_library(
191193
"@maven//:com_google_errorprone_error_prone_annotations",
192194
"@maven//:com_google_guava_guava",
193195
"@maven//:com_google_protobuf_protobuf_java",
196+
"@maven_android//:com_google_protobuf_protobuf_javalite",
194197
],
195198
)
196199

@@ -207,6 +210,7 @@ java_library(
207210
"@maven//:com_google_guava_guava",
208211
"@maven//:com_google_protobuf_protobuf_java",
209212
"@maven//:org_jspecify_jspecify",
213+
"@maven_android//:com_google_protobuf_protobuf_javalite",
210214
],
211215
)
212216

@@ -245,7 +249,18 @@ java_library(
245249
"//common/annotations",
246250
"@maven//:com_google_guava_guava",
247251
"@maven//:com_google_protobuf_protobuf_java",
248-
"@maven//:org_jspecify_jspecify",
252+
],
253+
)
254+
255+
cel_android_library(
256+
name = "well_known_proto_android",
257+
srcs = ["WellKnownProto.java"],
258+
tags = [
259+
],
260+
deps = [
261+
"//common/annotations",
262+
"@maven_android//:com_google_guava_guava",
263+
"@maven_android//:com_google_protobuf_protobuf_javalite",
249264
],
250265
)
251266

@@ -291,6 +306,61 @@ java_library(
291306
],
292307
)
293308

309+
java_library(
310+
name = "cel_lite_descriptor_pool",
311+
srcs = ["CelLiteDescriptorPool.java"],
312+
tags = [
313+
],
314+
deps = [
315+
"//protobuf:cel_lite_descriptor",
316+
"@maven//:com_google_errorprone_error_prone_annotations",
317+
],
318+
)
319+
320+
cel_android_library(
321+
name = "cel_lite_descriptor_pool_android",
322+
srcs = ["CelLiteDescriptorPool.java"],
323+
tags = [
324+
],
325+
deps = [
326+
"//protobuf:cel_lite_descriptor",
327+
"@maven//:com_google_errorprone_error_prone_annotations",
328+
],
329+
)
330+
331+
java_library(
332+
name = "default_lite_descriptor_pool",
333+
srcs = ["DefaultLiteDescriptorPool.java"],
334+
tags = [
335+
],
336+
deps = [
337+
":cel_lite_descriptor_pool",
338+
"//common/annotations",
339+
"//common/internal:well_known_proto",
340+
"//protobuf:cel_lite_descriptor",
341+
"@maven//:com_google_errorprone_error_prone_annotations",
342+
"@maven//:com_google_guava_guava",
343+
"@maven//:com_google_protobuf_protobuf_java",
344+
"@maven_android//:com_google_protobuf_protobuf_javalite",
345+
],
346+
)
347+
348+
cel_android_library(
349+
name = "default_lite_descriptor_pool_android",
350+
srcs = ["DefaultLiteDescriptorPool.java"],
351+
tags = [
352+
],
353+
deps = [
354+
":cel_lite_descriptor_pool_android",
355+
"//common/annotations",
356+
"//common/internal:well_known_proto_android",
357+
"//protobuf:cel_lite_descriptor",
358+
"@maven//:com_google_errorprone_error_prone_annotations",
359+
"@maven_android//:com_google_guava_guava",
360+
"@maven_android//:com_google_protobuf_protobuf_javalite",
361+
],
362+
)
363+
294364
java_library(
295365
name = "safe_string_formatter",
296366
srcs = ["SafeStringFormatter.java"],
@@ -309,6 +379,7 @@ java_library(
309379
tags = [
310380
],
311381
deps = [
382+
"//common/annotations",
312383
"@maven//:com_google_guava_guava",
313384
"@maven//:com_google_protobuf_protobuf_java",
314385
],
@@ -317,7 +388,6 @@ java_library(
317388
java_library(
318389
name = "reflection_util",
319390
srcs = ["ReflectionUtil.java"],
320-
deps = [
321-
"//common/annotations",
322-
],
391+
# used_by_android
392+
deps = ["//common/annotations"],
323393
)

0 commit comments

Comments
 (0)