Skip to content

Commit a7ab4ee

Browse files
dmitriplotnikovcopybara-github
dmitriplotnikov
authored and
copybara-github
committed
Exclude protobuf-javalite from the public artifacts for CEL.
This is done to avoid a dependency on both protobuf-java and protobuf-lite, which leads to a classpath conflict PiperOrigin-RevId: 789943418
1 parent 8a1ad06 commit a7ab4ee

9 files changed

Lines changed: 65 additions & 40 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ java_library(
209209
"@maven//:com_google_errorprone_error_prone_annotations",
210210
"@maven//:com_google_guava_guava",
211211
"@maven//:com_google_protobuf_protobuf_java",
212-
"@maven_android//:com_google_protobuf_protobuf_javalite",
213212
],
214213
)
215214

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ java_library(
5252
"@maven//:com_google_errorprone_error_prone_annotations",
5353
"@maven//:com_google_guava_guava",
5454
"@maven//:com_google_protobuf_protobuf_java",
55-
"@maven_android//:com_google_protobuf_protobuf_javalite",
5655
],
5756
)
5857

@@ -114,7 +113,7 @@ java_library(
114113
":ast",
115114
"//common/annotations",
116115
"@maven//:com_google_guava_guava",
117-
"@maven_android//:com_google_protobuf_protobuf_javalite",
116+
"@maven//:com_google_protobuf_protobuf_java",
118117
],
119118
)
120119

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ 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",
5150
],
5251
)
5352

@@ -140,7 +139,6 @@ java_library(
140139
":proto_java_qualified_names",
141140
"//common/annotations",
142141
"@maven//:com_google_protobuf_protobuf_java",
143-
"@maven_android//:com_google_protobuf_protobuf_javalite",
144142
],
145143
)
146144

@@ -175,7 +173,6 @@ java_library(
175173
"@maven//:com_google_errorprone_error_prone_annotations",
176174
"@maven//:com_google_guava_guava",
177175
"@maven//:com_google_protobuf_protobuf_java",
178-
"@maven_android//:com_google_protobuf_protobuf_javalite",
179176
],
180177
)
181178

@@ -210,7 +207,6 @@ java_library(
210207
"@maven//:com_google_guava_guava",
211208
"@maven//:com_google_protobuf_protobuf_java",
212209
"@maven//:org_jspecify_jspecify",
213-
"@maven_android//:com_google_protobuf_protobuf_javalite",
214210
],
215211
)
216212

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ java_library(
181181
"@maven//:com_google_errorprone_error_prone_annotations",
182182
"@maven//:com_google_guava_guava",
183183
"@maven//:com_google_protobuf_protobuf_java",
184-
"@maven_android//:com_google_protobuf_protobuf_javalite",
185184
],
186185
)
187186

@@ -223,7 +222,6 @@ java_library(
223222
"@maven//:com_google_guava_guava",
224223
"@maven//:com_google_protobuf_protobuf_java",
225224
"@maven//:org_jspecify_jspecify",
226-
"@maven_android//:com_google_protobuf_protobuf_javalite",
227225
],
228226
)
229227

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ java_library(
162162
"//runtime:function_binding",
163163
"@maven//:com_google_errorprone_error_prone_annotations",
164164
"@maven//:com_google_guava_guava",
165-
"@maven_android//:com_google_protobuf_protobuf_javalite",
165+
"@maven//:com_google_protobuf_protobuf_java",
166166
],
167167
)
168168

@@ -187,7 +187,6 @@ java_library(
187187
"//runtime:runtime_equality",
188188
"@maven//:com_google_guava_guava",
189189
"@maven//:com_google_protobuf_protobuf_java",
190-
"@maven_android//:com_google_protobuf_protobuf_javalite",
191190
],
192191
)
193192

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ java_library(
140140
"//common/ast",
141141
"//common/ast:cel_expr_visitor",
142142
"@maven//:com_google_guava_guava",
143+
"@maven//:com_google_protobuf_protobuf_java",
143144
"@maven//:com_google_re2j_re2j",
144-
"@maven_android//:com_google_protobuf_protobuf_javalite",
145145
],
146146
)

‎runtime/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ cel_android_library(
7878

7979
java_library(
8080
name = "function_overload_impl",
81-
# used_by_android
8281
visibility = ["//:internal"],
8382
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_impl"],
8483
)

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

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ cel_android_library(
137137
":base_android",
138138
":evaluation_exception",
139139
":evaluation_exception_builder",
140-
":function_overload_impl",
140+
":lite_function_overload_impl",
141141
"//:auto_value",
142142
"//common:error_codes",
143143
"//common/annotations",
@@ -157,8 +157,8 @@ java_library(
157157
":runtime_helpers",
158158
"//common/annotations",
159159
"@maven//:com_google_guava_guava",
160+
"@maven//:com_google_protobuf_protobuf_java",
160161
"@maven//:org_jspecify_jspecify",
161-
"@maven_android//:com_google_protobuf_protobuf_javalite",
162162
],
163163
)
164164

@@ -202,7 +202,6 @@ java_library(
202202
"@maven//:com_google_errorprone_error_prone_annotations",
203203
"@maven//:com_google_guava_guava",
204204
"@maven//:com_google_protobuf_protobuf_java",
205-
"@maven_android//:com_google_protobuf_protobuf_javalite",
206205
],
207206
)
208207

@@ -254,7 +253,7 @@ cel_android_library(
254253
srcs = BASE_SOURCES,
255254
visibility = ["//visibility:private"],
256255
deps = [
257-
":function_overload_impl",
256+
":lite_function_overload_impl",
258257
":metadata",
259258
"//common:cel_ast_android",
260259
"//common/annotations",
@@ -314,9 +313,9 @@ cel_android_library(
314313
":evaluation_exception",
315314
":evaluation_exception_builder",
316315
":evaluation_listener_android",
317-
":function_overload_impl",
318316
":interpretable_android",
319317
":interpreter_util_android",
318+
":lite_function_overload_impl",
320319
":metadata",
321320
":runtime_helpers_android",
322321
":runtime_type_provider_android",
@@ -354,7 +353,7 @@ java_library(
354353
"//common/internal:comparison_functions",
355354
"@maven//:com_google_errorprone_error_prone_annotations",
356355
"@maven//:com_google_guava_guava",
357-
"@maven_android//:com_google_protobuf_protobuf_javalite",
356+
"@maven//:com_google_protobuf_protobuf_java",
358357
],
359358
)
360359

@@ -435,7 +434,6 @@ java_library(
435434
"@maven//:com_google_protobuf_protobuf_java",
436435
"@maven//:com_google_re2j_re2j",
437436
"@maven//:org_threeten_threeten_extra",
438-
"@maven_android//:com_google_protobuf_protobuf_javalite",
439437
],
440438
)
441439

@@ -501,9 +499,9 @@ cel_android_library(
501499
":dispatcher_android",
502500
":evaluation_exception",
503501
":function_binding_android",
504-
":function_overload",
505-
":function_overload_impl",
506-
":function_resolver",
502+
":lite_function_overload",
503+
":lite_function_overload_impl",
504+
":lite_function_resolver",
507505
"//:auto_value",
508506
"@maven//:com_google_errorprone_error_prone_annotations",
509507
"@maven_android//:com_google_guava_guava",
@@ -585,7 +583,7 @@ cel_android_library(
585583
deps = [
586584
":evaluation_exception",
587585
":evaluation_listener_android",
588-
":function_overload_impl",
586+
":lite_function_overload_impl",
589587
"//common/annotations",
590588
"@maven//:com_google_errorprone_error_prone_annotations",
591589
"@maven//:org_jspecify_jspecify",
@@ -723,7 +721,7 @@ cel_android_library(
723721
tags = [
724722
],
725723
deps = [
726-
":function_overload",
724+
":lite_function_overload",
727725
"//common/annotations",
728726
"@maven//:com_google_errorprone_error_prone_annotations",
729727
"@maven_android//:com_google_guava_guava",
@@ -733,7 +731,6 @@ cel_android_library(
733731
java_library(
734732
name = "function_resolver",
735733
srcs = ["CelFunctionResolver.java"],
736-
# used_by_android
737734
tags = [
738735
],
739736
deps = [
@@ -743,12 +740,24 @@ java_library(
743740
],
744741
)
745742

743+
java_library(
744+
name = "lite_function_resolver",
745+
srcs = ["CelFunctionResolver.java"],
746+
# used_by_android
747+
tags = [
748+
],
749+
deps = [
750+
":lite_function_overload_impl",
751+
"@maven//:com_google_code_findbugs_annotations",
752+
"@maven//:com_google_errorprone_error_prone_annotations",
753+
],
754+
)
755+
746756
java_library(
747757
name = "function_overload",
748758
srcs = [
749759
"CelFunctionOverload.java",
750760
],
751-
# used_by_android
752761
tags = [
753762
],
754763
deps = [
@@ -757,13 +766,45 @@ java_library(
757766
],
758767
)
759768

769+
java_library(
770+
name = "lite_function_overload",
771+
srcs = [
772+
"CelFunctionOverload.java",
773+
],
774+
# used_by_android
775+
tags = [
776+
],
777+
deps = [
778+
":lite_function_overload_impl",
779+
"@maven//:com_google_errorprone_error_prone_annotations",
780+
],
781+
)
782+
760783
java_library(
761784
name = "function_overload_impl",
762785
srcs = [
763786
"FunctionOverload.java",
764787
"FunctionResolver.java",
765788
"ResolvedOverload.java",
766789
],
790+
tags = [
791+
],
792+
deps = [
793+
":evaluation_exception",
794+
"//common/annotations",
795+
"@maven//:com_google_code_findbugs_annotations",
796+
"@maven//:com_google_errorprone_error_prone_annotations",
797+
"@maven//:com_google_protobuf_protobuf_java",
798+
],
799+
)
800+
801+
java_library(
802+
name = "lite_function_overload_impl",
803+
srcs = [
804+
"FunctionOverload.java",
805+
"FunctionResolver.java",
806+
"ResolvedOverload.java",
807+
],
767808
# used_by_android
768809
tags = [
769810
],
@@ -828,7 +869,7 @@ java_library(
828869
deps = [
829870
":evaluation_exception",
830871
":function_binding",
831-
":function_resolver",
872+
":lite_function_resolver",
832873
"//:auto_value",
833874
"//common:cel_ast",
834875
"//common:options",
@@ -852,9 +893,9 @@ java_library(
852893
":dispatcher",
853894
":evaluation_exception",
854895
":function_binding",
855-
":function_resolver",
856896
":interpretable",
857897
":interpreter",
898+
":lite_function_resolver",
858899
":lite_runtime",
859900
":runtime_equality",
860901
":runtime_helpers",
@@ -881,9 +922,9 @@ cel_android_library(
881922
":dispatcher_android",
882923
":evaluation_exception",
883924
":function_binding_android",
884-
":function_resolver",
885925
":interpretable_android",
886926
":interpreter_android",
927+
":lite_function_resolver",
887928
":lite_runtime_android",
888929
":runtime_equality_android",
889930
":runtime_helpers_android",
@@ -1001,7 +1042,7 @@ java_library(
10011042
"//common/values:combined_cel_value_provider",
10021043
"@maven//:com_google_errorprone_error_prone_annotations",
10031044
"@maven//:com_google_guava_guava",
1004-
"@maven_android//:com_google_protobuf_protobuf_javalite",
1045+
"@maven//:com_google_protobuf_protobuf_java",
10051046
],
10061047
)
10071048

@@ -1086,7 +1127,7 @@ cel_android_library(
10861127
deps = [
10871128
":evaluation_exception",
10881129
":function_binding_android",
1089-
":function_resolver",
1130+
":lite_function_resolver",
10901131
"//:auto_value",
10911132
"//common:cel_ast_android",
10921133
"//common:options",

‎runtime/src/main/java/dev/cel/runtime/standard/BUILD.bazel‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ java_library(
5656
"//runtime:runtime_helpers",
5757
"@maven//:com_google_guava_guava",
5858
"@maven//:com_google_protobuf_protobuf_java",
59-
"@maven_android//:com_google_protobuf_protobuf_javalite",
6059
],
6160
)
6261

@@ -168,7 +167,7 @@ java_library(
168167
"//runtime:runtime_equality",
169168
"//runtime/standard:standard_function",
170169
"@maven//:com_google_guava_guava",
171-
"@maven_android//:com_google_protobuf_protobuf_javalite",
170+
"@maven//:com_google_protobuf_protobuf_java",
172171
],
173172
)
174173

@@ -744,7 +743,6 @@ java_library(
744743
"//runtime/standard:standard_function",
745744
"@maven//:com_google_guava_guava",
746745
"@maven//:com_google_protobuf_protobuf_java",
747-
"@maven_android//:com_google_protobuf_protobuf_javalite",
748746
],
749747
)
750748

@@ -783,7 +781,6 @@ java_library(
783781
"//runtime/standard:standard_function",
784782
"@maven//:com_google_guava_guava",
785783
"@maven//:com_google_protobuf_protobuf_java",
786-
"@maven_android//:com_google_protobuf_protobuf_javalite",
787784
],
788785
)
789786

@@ -924,7 +921,6 @@ java_library(
924921
"//runtime/standard:standard_function",
925922
"@maven//:com_google_guava_guava",
926923
"@maven//:com_google_protobuf_protobuf_java",
927-
"@maven_android//:com_google_protobuf_protobuf_javalite",
928924
],
929925
)
930926

@@ -963,7 +959,6 @@ java_library(
963959
"//runtime/standard:standard_function",
964960
"@maven//:com_google_guava_guava",
965961
"@maven//:com_google_protobuf_protobuf_java",
966-
"@maven_android//:com_google_protobuf_protobuf_javalite",
967962
],
968963
)
969964

@@ -1238,7 +1233,7 @@ java_library(
12381233
"//runtime:runtime_equality",
12391234
"//runtime/standard:standard_function",
12401235
"@maven//:com_google_guava_guava",
1241-
"@maven_android//:com_google_protobuf_protobuf_javalite",
1236+
"@maven//:com_google_protobuf_protobuf_java",
12421237
],
12431238
)
12441239

@@ -1304,7 +1299,6 @@ java_library(
13041299
"//runtime/standard:standard_function",
13051300
"@maven//:com_google_guava_guava",
13061301
"@maven//:com_google_protobuf_protobuf_java",
1307-
"@maven_android//:com_google_protobuf_protobuf_javalite",
13081302
],
13091303
)
13101304

0 commit comments

Comments
 (0)