Skip to content

Commit f030854

Browse files
l46kokcopybara-github
authored andcommitted
Migrate to Bzlmod
PiperOrigin-RevId: 627072320
1 parent 95cb753 commit f030854

File tree

38 files changed

+212
-245
lines changed

38 files changed

+212
-245
lines changed

.bazelrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Enable Bzlmod for every Bazel command
2+
common --enable_bzlmod

.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ bazel-cel-java
66
bazel-out
77
bazel-testlogs
88

9-
MODULE.bazel*
10-
119
# IntelliJ IDEA
1210
.idea
1311
*.iml
@@ -30,3 +28,6 @@ target
3028

3129
# Temporary output dir for artifacts
3230
mvn-artifacts
31+
32+
*.swp
33+
*.lock

MODULE.bazel

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Copyright 2024 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
module(
16+
name = "cel_java"
17+
)
18+
19+
bazel_dep(name = "bazel_skylib", version = "1.4.2")
20+
bazel_dep(name = "rules_jvm_external", version = "6.0")
21+
bazel_dep(name = "protobuf", repo_name="com_google_protobuf", version = "23.1")
22+
bazel_dep(name = "rules_pkg", version = "0.10.1")
23+
bazel_dep(name = "rules_license", version = "0.0.8")
24+
bazel_dep(name = "rules_java", version = "7.4.0")
25+
bazel_dep(name = "cel-spec", repo_name="cel_spec", version = "0.14.0")
26+
27+
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
28+
29+
maven.install(
30+
# keep sorted
31+
artifacts = [
32+
"com.google.api.grpc:proto-google-common-protos:2.27.0",
33+
"com.google.auto.value:auto-value-annotations:1.10.4",
34+
"com.google.auto.value:auto-value:1.10.4",
35+
"com.google.code.findbugs:annotations:3.0.1",
36+
"com.google.errorprone:error_prone_annotations:2.23.0",
37+
"com.google.guava:guava-testlib:33.0.0-jre",
38+
"com.google.guava:guava:33.0.0-jre",
39+
"com.google.protobuf:protobuf-java-util:3.24.4",
40+
"com.google.protobuf:protobuf-java:3.24.4",
41+
"com.google.re2j:re2j:1.7",
42+
"com.google.testparameterinjector:test-parameter-injector:1.15",
43+
"com.google.truth.extensions:truth-java8-extension:1.4.0",
44+
"com.google.truth.extensions:truth-proto-extension:1.4.0",
45+
"com.google.truth:truth:1.4.0",
46+
"org.antlr:antlr4-runtime:4.11.1",
47+
"org.jspecify:jspecify:0.2.0",
48+
"org.threeten:threeten-extra:1.7.2",
49+
],
50+
repositories = [
51+
"https://maven.google.com",
52+
"https://repo1.maven.org/maven2",
53+
],
54+
)
55+
use_repo(maven, "maven")
56+
57+
non_module_dependencies = use_extension("//:repositories.bzl", "non_module_dependencies")
58+
use_repo(non_module_dependencies, "antlr4_jar")
59+
use_repo(non_module_dependencies, "bazel_common")
60+
61+
# Note: We aren't able to use Bazel Central Registry for googleapis
62+
# until https://github.com/bazelbuild/rules_jvm_external/issues/1048 is resolved.
63+
GOOGLE_APIS_VERSION = "d73a41615b101c34c58b3534c2cc7ee1d89cccb0"
64+
65+
bazel_dep(name = "com_google_googleapis", version = GOOGLE_APIS_VERSION)
66+
archive_override(
67+
module_name = "com_google_googleapis",
68+
integrity = "sha256-sOd1u3SXtn/7CtnH6dxze8ZEkSkRsOJHTusK/STVi0c=",
69+
patch_strip = 1,
70+
patches = [
71+
# See https://github.com/bazelbuild/rules_go/issues/3685
72+
"googleapis_add_bzlmod_support.patch"
73+
],
74+
strip_prefix = "googleapis-" + GOOGLE_APIS_VERSION,
75+
urls = [
76+
"https://github.com/googleapis/googleapis/archive/%s.zip" % GOOGLE_APIS_VERSION
77+
],
78+
)
79+
80+
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
81+
switched_rules.use_languages(java = True)
82+
use_repo(switched_rules, "com_google_googleapis_imports")
83+

WORKSPACE

-172
This file was deleted.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ java_library(
99
testonly = True,
1010
srcs = glob(["*Test.java"]),
1111
deps = [
12-
"//:auto_value",
13-
"//:java_truth",
12+
":auto_value",
13+
":java_truth",
1414
"//bundle:cel",
1515
"//checker",
1616
"//checker:checker_legacy_environment",

checker/src/main/java/dev/cel/checker/BUILD.bazel

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ java_library(
4444
tags = [
4545
],
4646
deps = [
47-
"//:auto_value",
47+
":auto_value",
4848
"//common/annotations",
4949
"//common/internal:file_descriptor_converter",
5050
"//common/types",
@@ -64,12 +64,12 @@ java_library(
6464
tags = [
6565
],
6666
deps = [
67+
":auto_value",
6768
":cel_ident_decl",
6869
":checker_builder",
6970
":checker_legacy_environment",
7071
":proto_type_mask",
7172
":type_provider_legacy_impl",
72-
"//:auto_value",
7373
"//common",
7474
"//common:compiler_common",
7575
"//common:options",
@@ -112,7 +112,7 @@ java_library(
112112
tags = [
113113
],
114114
deps = [
115-
"//:auto_value",
115+
":auto_value",
116116
"@maven//:com_google_errorprone_error_prone_annotations",
117117
"@maven//:com_google_guava_guava",
118118
"@maven//:com_google_protobuf_protobuf_java",
@@ -127,7 +127,7 @@ java_library(
127127
tags = [
128128
],
129129
deps = [
130-
"//:auto_value",
130+
":auto_value",
131131
"//common/annotations",
132132
"//common/ast",
133133
"//common/ast:expr_converter",
@@ -145,8 +145,8 @@ java_library(
145145
tags = [
146146
],
147147
deps = [
148+
":auto_value",
148149
":checker_legacy_environment",
149-
"//:auto_value",
150150
"//common/annotations",
151151
"//common/types",
152152
"//common/types:cel_types",
@@ -164,8 +164,8 @@ java_library(
164164
tags = [
165165
],
166166
deps = [
167+
":auto_value",
167168
":cel_ident_decl",
168-
"//:auto_value",
169169
"//common:compiler_common",
170170
"//common:features",
171171
"//common:options",
@@ -194,7 +194,7 @@ java_library(
194194
tags = [
195195
],
196196
deps = [
197-
"//:auto_value",
197+
":auto_value",
198198
"//common/types",
199199
"//common/types:type_providers",
200200
"@maven//:com_google_errorprone_error_prone_annotations",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ java_library(
1111
resources = ["//checker/src/test/resources:baselines"],
1212
deps = [
1313
# "//java/com/google/testing/testsize:annotations",
14-
"//:auto_value",
14+
":auto_value",
1515
"//checker",
1616
"//checker:cel_ident_decl",
1717
"//checker:checker_builder",
@@ -45,7 +45,7 @@ java_library(
4545
"@maven//:com_google_errorprone_error_prone_annotations",
4646
"@maven//:org_jspecify_jspecify",
4747
"@maven//:junit_junit",
48-
"//:java_truth",
48+
":java_truth",
4949
"@maven//:com_google_truth_extensions_truth_proto_extension",
5050
"@cel_spec//proto/cel/expr:expr_java_proto",
5151
"@maven//:com_google_api_grpc_proto_google_common_protos",

0 commit comments

Comments
 (0)