Skip to content

Commit ba20bb2

Browse files
l46kokcopybara-github
authored andcommitted
Add android BUILD targets for common/types
PiperOrigin-RevId: 726262087
1 parent 417d1fe commit ba20bb2

File tree

4 files changed

+96
-2
lines changed

4 files changed

+96
-2
lines changed

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

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@rules_java//java:defs.bzl", "java_library")
2+
load("//:cel_android_library.bzl", "cel_android_library")
23

34
package(
45
default_applicable_licenses = [
@@ -94,13 +95,29 @@ java_library(
9495
],
9596
)
9697

98+
cel_android_library(
99+
name = "cel_proto_types_android",
100+
srcs = ["CelProtoTypes.java"],
101+
tags = [
102+
],
103+
deps = [
104+
":cel_internal_types_android",
105+
":cel_types_android",
106+
":type_providers_android",
107+
":types_android",
108+
"@cel_spec//proto/cel/expr:checked_java_proto_lite",
109+
"@maven_android//:com_google_guava_guava",
110+
"@maven_android//:com_google_protobuf_protobuf_javalite",
111+
],
112+
)
113+
97114
java_library(
98115
name = "cel_proto_message_types",
99116
srcs = ["CelProtoMessageTypes.java"],
100117
tags = [
101118
],
102119
deps = [
103-
"//common/types:cel_proto_types",
120+
":cel_proto_types",
104121
"@cel_spec//proto/cel/expr:checked_java_proto",
105122
"@maven//:com_google_protobuf_protobuf_java",
106123
],
@@ -164,3 +181,52 @@ java_library(
164181
"@maven//:com_google_protobuf_protobuf_java",
165182
],
166183
)
184+
185+
cel_android_library(
186+
name = "cel_types_android",
187+
srcs = ["CelTypes.java"],
188+
tags = [
189+
],
190+
deps = [
191+
"//common/annotations",
192+
"//common/types:type_providers_android",
193+
"//common/types:types_android",
194+
"@maven_android//:com_google_guava_guava",
195+
],
196+
)
197+
198+
cel_android_library(
199+
name = "type_providers_android",
200+
srcs = CEL_TYPE_PROVIDER_SOURCES,
201+
tags = [
202+
],
203+
deps = [
204+
"@maven//:com_google_errorprone_error_prone_annotations",
205+
"@maven_android//:com_google_guava_guava",
206+
],
207+
)
208+
209+
cel_android_library(
210+
name = "types_android",
211+
srcs = CEL_TYPE_SOURCES,
212+
tags = [
213+
],
214+
deps = [
215+
":type_providers_android",
216+
"//:auto_value",
217+
"//common/annotations",
218+
"@maven//:com_google_errorprone_error_prone_annotations",
219+
"@maven_android//:com_google_guava_guava",
220+
],
221+
)
222+
223+
cel_android_library(
224+
name = "cel_internal_types_android",
225+
srcs = CEL_INTERNAL_TYPE_SOURCES,
226+
deps = [
227+
"//:auto_value",
228+
"//common/annotations",
229+
"//common/types:type_providers_android",
230+
"@maven//:com_google_errorprone_error_prone_annotations",
231+
],
232+
)

common/src/main/java/dev/cel/common/types/EnumType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,15 @@ public Optional<String> findNameByNumber(Integer enumNumber) {
6262
/** Functional interface for lookup up an enum number by its local or fully qualified name. */
6363
@Immutable
6464
@FunctionalInterface
65+
@SuppressWarnings("AndroidJdkLibsChecker") // FunctionalInterface added in 24
6566
public interface EnumNumberResolver {
6667
Optional<Integer> findNumber(String enumName);
6768
}
6869

6970
/** Functional interface for looking up an enum name by its number. */
7071
@Immutable
7172
@FunctionalInterface
73+
@SuppressWarnings("AndroidJdkLibsChecker") // FunctionalInterface added in 24
7274
public interface EnumNameResolver {
7375
Optional<String> findName(Integer enumNumber);
7476
}

common/src/main/java/dev/cel/common/types/StructType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public static StructType create(
9999
*/
100100
@Immutable
101101
@FunctionalInterface
102-
public static interface FieldResolver {
102+
@SuppressWarnings("AndroidJdkLibsChecker") // FunctionalInterface added in 24
103+
public interface FieldResolver {
103104
/** Find the {@code CelType} for the given {@code fieldName} if the field is defined. */
104105
Optional<CelType> findField(String fieldName);
105106
}

common/types/BUILD.bazel

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@rules_java//java:defs.bzl", "java_library")
2+
load("//:cel_android_library.bzl", "cel_android_library")
23

34
package(
45
default_applicable_licenses = ["//:license"],
@@ -54,3 +55,27 @@ java_library(
5455
visibility = ["//visibility:public"],
5556
exports = ["//common/src/main/java/dev/cel/common/types:cel_v1alpha1_types"],
5657
)
58+
59+
cel_android_library(
60+
name = "cel_types_android",
61+
visibility = ["//visibility:public"],
62+
exports = ["//common/src/main/java/dev/cel/common/types:cel_types_android"],
63+
)
64+
65+
cel_android_library(
66+
name = "types_android",
67+
visibility = ["//visibility:public"],
68+
exports = ["//common/src/main/java/dev/cel/common/types:types_android"],
69+
)
70+
71+
cel_android_library(
72+
name = "type_providers_android",
73+
visibility = ["//visibility:public"],
74+
exports = ["//common/src/main/java/dev/cel/common/types:type_providers_android"],
75+
)
76+
77+
cel_android_library(
78+
name = "cel_proto_types_android",
79+
visibility = ["//visibility:public"],
80+
exports = ["//common/src/main/java/dev/cel/common/types:cel_proto_types_android"],
81+
)

0 commit comments

Comments
 (0)