Skip to content

Commit 7a42298

Browse files
l46kokcopybara-github
authored andcommitted
Fix Bazel to work with 8.3.0
Also contains updates to maven dependencies PiperOrigin-RevId: 775437050
1 parent 6ba18a0 commit 7a42298

File tree

2 files changed

+27
-22
lines changed

2 files changed

+27
-22
lines changed

.bazelversion

Lines changed: 0 additions & 1 deletion
This file was deleted.

WORKSPACE

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,22 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
4343

4444
bazel_skylib_workspace()
4545

46+
### rules_shell setup (sh_test)
47+
48+
http_archive(
49+
name = "rules_shell",
50+
sha256 = "b15cc2e698a3c553d773ff4af35eb4b3ce2983c319163707dddd9e70faaa062d",
51+
strip_prefix = "rules_shell-0.5.0",
52+
url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.5.0/rules_shell-v0.5.0.tar.gz",
53+
)
54+
55+
load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")
56+
57+
rules_shell_dependencies()
58+
rules_shell_toolchains()
59+
60+
### end of rules_shell setup
61+
4662
### Protobuf Setup
4763

4864
http_archive(
@@ -127,25 +143,25 @@ load("//:maven_utils.bzl", "maven_artifact_compile_only", "maven_artifact_test_o
127143
### end of rules_jvm_external setup
128144

129145
ANTLR4_VERSION = "4.13.2"
146+
GUAVA_VERSION = "33.4.8"
130147

131148
maven_install(
132149
name = "maven",
133150
# keep sorted
134151
artifacts = [
135152
"com.google.auto.value:auto-value:1.11.0",
136153
"com.google.auto.value:auto-value-annotations:1.11.0",
137-
"com.google.guava:guava:33.4.0-jre",
138-
"com.google.guava:guava-testlib:33.4.0-jre",
154+
"com.google.guava:guava:" + GUAVA_VERSION + "-jre",
155+
"com.google.guava:guava-testlib:" + GUAVA_VERSION + "-jre",
139156
"com.google.protobuf:protobuf-java:4.31.0",
140157
"com.google.protobuf:protobuf-java-util:4.31.0",
141158
"com.google.re2j:re2j:1.8",
142-
"info.picocli:picocli:4.7.6",
159+
"info.picocli:picocli:4.7.7",
143160
"org.antlr:antlr4-runtime:" + ANTLR4_VERSION,
144-
"info.picocli:picocli:4.7.6",
145-
"org.freemarker:freemarker:2.3.33",
161+
"org.freemarker:freemarker:2.3.34",
146162
"org.jspecify:jspecify:1.0.0",
147163
"org.threeten:threeten-extra:1.8.0",
148-
"org.yaml:snakeyaml:2.3",
164+
"org.yaml:snakeyaml:2.4",
149165
maven_artifact_test_only("org.mockito", "mockito-core", "4.11.0"),
150166
maven_artifact_test_only("io.github.classgraph", "classgraph", "4.8.179"),
151167
maven_artifact_test_only("com.google.testparameterinjector", "test-parameter-injector", "1.18"),
@@ -154,7 +170,7 @@ maven_install(
154170
maven_artifact_test_only("com.google.truth.extensions", "truth-proto-extension", "1.4.4"),
155171
maven_artifact_test_only("com.google.truth.extensions", "truth-liteproto-extension", "1.4.4"),
156172
maven_artifact_compile_only("com.google.code.findbugs", "annotations", "3.0.1"),
157-
maven_artifact_compile_only("com.google.errorprone", "error_prone_annotations", "2.36.0"),
173+
maven_artifact_compile_only("com.google.errorprone", "error_prone_annotations", "2.38.0"),
158174
],
159175
repositories = [
160176
"https://maven.google.com",
@@ -166,7 +182,7 @@ maven_install(
166182
name = "maven_android",
167183
# keep sorted
168184
artifacts = [
169-
"com.google.guava:guava:33.4.0-android",
185+
"com.google.guava:guava:" + GUAVA_VERSION + "-android",
170186
"com.google.protobuf:protobuf-javalite:4.31.0",
171187
],
172188
repositories = [
@@ -209,10 +225,10 @@ register_toolchains(
209225
# as of 12/08/2022
210226
http_archive(
211227
name = "com_google_googleapis",
212-
sha256 = "8503282213779a3c230251218c924f385f457a053b4f82ff95d068f71815e558",
213-
strip_prefix = "googleapis-d73a41615b101c34c58b3534c2cc7ee1d89cccb0",
228+
sha256 = "cd5e8b816612cb6659fca62137ad0206747c4605dc055efcb361e7d3b4e9cedd",
229+
strip_prefix = "googleapis-d2835e84647d7477511f7ae48e36d4cfe7b04a10",
214230
urls = [
215-
"https://github.com/googleapis/googleapis/archive/d73a41615b101c34c58b3534c2cc7ee1d89cccb0.tar.gz",
231+
"https://github.com/googleapis/googleapis/archive/d2835e84647d7477511f7ae48e36d4cfe7b04a10.tar.gz",
216232
],
217233
)
218234

@@ -264,16 +280,6 @@ http_archive(
264280
],
265281
)
266282

267-
# required by cel_spec
268-
http_archive(
269-
name = "io_bazel_rules_go",
270-
sha256 = "19ef30b21eae581177e0028f6f4b1f54c66467017be33d211ab6fc81da01ea4d",
271-
urls = [
272-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
273-
"https://github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
274-
],
275-
)
276-
277283
http_jar(
278284
name = "antlr4_jar",
279285
sha256 = "eae2dfa119a64327444672aff63e9ec35a20180dc5b8090b7a6ab85125df4d76",

0 commit comments

Comments
 (0)