@@ -483,42 +483,146 @@ cel_android_library(
483483java_library (
484484 name = "regex" ,
485485 srcs = ["CelRegexExtensions.java" ],
486+ tags = [
487+ ],
486488 deps = [
489+ ":extension_library" ,
490+ ":regex_compiler_library" ,
491+ ":regex_runtime_library" ,
487492 "//checker:checker_builder" ,
488- "//common:compiler_common" ,
489- "//common/types" ,
493+ "//common:cel_function_decl" ,
490494 "//compiler:compiler_builder" ,
491- "//extensions:extension_library" ,
492495 "//runtime" ,
496+ "@maven//:com_google_errorprone_error_prone_annotations" ,
497+ "@maven//:com_google_guava_guava" ,
498+ ],
499+ )
500+
501+ java_library (
502+ name = "regex_compiler_library" ,
503+ srcs = ["CelRegexCompilerLibrary.java" ],
504+ tags = [
505+ ],
506+ deps = [
507+ ":extension_library" ,
508+ "//checker:checker_builder" ,
509+ "//common:cel_function_decl" ,
510+ "//common:cel_overload_decl" ,
511+ "//common/types" ,
512+ "//compiler:compiler_builder" ,
513+ "@maven//:com_google_errorprone_error_prone_annotations" ,
514+ "@maven//:com_google_guava_guava" ,
515+ ],
516+ )
517+
518+ java_library (
519+ name = "regex_runtime_library" ,
520+ srcs = ["CelRegexRuntimeLibrary.java" ],
521+ tags = [
522+ ],
523+ deps = [
493524 "//runtime:function_binding" ,
525+ "//runtime:lite_runtime" ,
494526 "@maven//:com_google_errorprone_error_prone_annotations" ,
495527 "@maven//:com_google_guava_guava" ,
496528 "@maven//:com_google_re2j_re2j" ,
497529 ],
498530)
499531
532+ cel_android_library (
533+ name = "regex_runtime_library_android" ,
534+ srcs = ["CelRegexRuntimeLibrary.java" ],
535+ tags = [
536+ ],
537+ deps = [
538+ "//runtime:function_binding_android" ,
539+ "//runtime:lite_runtime_android" ,
540+ "@maven//:com_google_errorprone_error_prone_annotations" ,
541+ "@maven//:com_google_re2j_re2j" ,
542+ "@maven_android//:com_google_guava_guava" ,
543+ ],
544+ )
545+
500546java_library (
501547 name = "comprehensions" ,
502548 srcs = ["CelComprehensionsExtensions.java" ],
549+ tags = [
550+ ],
503551 deps = [
552+ ":comprehensions_compiler_library" ,
553+ ":comprehensions_runtime_library" ,
554+ ":extension_library" ,
504555 "//checker:checker_builder" ,
505- "//common:compiler_common" ,
506- "//common:operator" ,
556+ "//common:cel_function_decl" ,
507557 "//common:options" ,
558+ "//compiler:compiler_builder" ,
559+ "//parser:macro" ,
560+ "//parser:parser_builder" ,
561+ "//runtime" ,
562+ "//runtime:runtime_equality" ,
563+ "@maven//:com_google_errorprone_error_prone_annotations" ,
564+ "@maven//:com_google_guava_guava" ,
565+ ],
566+ )
567+
568+ java_library (
569+ name = "comprehensions_compiler_library" ,
570+ srcs = ["CelComprehensionsCompilerLibrary.java" ],
571+ tags = [
572+ "alt_dep=//extensions:comprehensions_compiler_library" ,
573+ ],
574+ deps = [
575+ ":extension_library" ,
576+ "//checker:checker_builder" ,
577+ "//common:cel_function_decl" ,
578+ "//common:cel_issue" ,
579+ "//common:cel_overload_decl" ,
580+ "//common:operator" ,
508581 "//common/ast" ,
509582 "//common/types" ,
510- "//common/values:mutable_map_value" ,
511583 "//compiler:compiler_builder" ,
512- "//extensions:extension_library" ,
513584 "//parser:macro" ,
514585 "//parser:parser_builder" ,
515- "//runtime" ,
586+ "@maven//:com_google_errorprone_error_prone_annotations" ,
587+ "@maven//:com_google_guava_guava" ,
588+ ],
589+ )
590+
591+ java_library (
592+ name = "comprehensions_runtime_library" ,
593+ srcs = ["CelComprehensionsRuntimeLibrary.java" ],
594+ tags = [
595+ "alt_dep=//extensions:comprehensions_runtime_library" ,
596+ ],
597+ deps = [
598+ "//common:options" ,
599+ "//common/values:mutable_map_value" ,
516600 "//runtime:function_binding" ,
601+ "//runtime:lite_runtime" ,
517602 "//runtime:runtime_equality" ,
603+ "//runtime:runtime_helpers" ,
604+ "@maven//:com_google_errorprone_error_prone_annotations" ,
518605 "@maven//:com_google_guava_guava" ,
519606 ],
520607)
521608
609+ cel_android_library (
610+ name = "comprehensions_runtime_library_android" ,
611+ srcs = ["CelComprehensionsRuntimeLibrary.java" ],
612+ tags = [
613+ ],
614+ deps = [
615+ "//common:options" ,
616+ "//common/values:mutable_map_value_android" ,
617+ "//runtime:function_binding_android" ,
618+ "//runtime:lite_runtime_android" ,
619+ "//runtime:runtime_equality_android" ,
620+ "//runtime:runtime_helpers_android" ,
621+ "@maven//:com_google_errorprone_error_prone_annotations" ,
622+ "@maven_android//:com_google_guava_guava" ,
623+ ],
624+ )
625+
522626java_library (
523627 name = "native" ,
524628 srcs = ["CelNativeTypesExtensions.java" ],
0 commit comments