Skip to content

Commit e68f241

Browse files
cpovirkcopybara-github
authored andcommitted
Update bazel-common to pick up Guava 33.0.0 and Truth to 1.3.0.
New commit: google/bazel-common@2a6b640 This helps with google/truth#746. PiperOrigin-RevId: 603080414
1 parent 723ad18 commit e68f241

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

WORKSPACE.bazel

+25-25
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,15 @@ rules_jvm_external_deps()
1818
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
1919
rules_jvm_external_setup()
2020

21-
#
22-
# To update google_bazel_common, locate the git commit to depend on and
23-
# use something like the following to determine the sha256
24-
# curl -L https://github.com/google/bazel-common/archive/<git-commit-id>.zip |
25-
# sha256
26-
#
27-
#
21+
# From https://github.com/bazelbuild/rules_java/releases/
2822
http_archive(
29-
name = "google_bazel_common",
30-
# output from `sha256sum` on the downloaded zip file
31-
sha256 = "bcb5de5a5b951434828ead94479d3e1ff6501c2c8fc490db6cf3fbf7c188684b",
32-
strip_prefix = "bazel-common-aaa4d801588f7744c6f4428e4f133f26b8518f42",
33-
urls = [
34-
"https://github.com/google/bazel-common/archive/aaa4d801588f7744c6f4428e4f133f26b8518f42.zip",
35-
],
23+
name = "rules_java",
24+
url = "https://github.com/bazelbuild/rules_java/releases/download/5.1.0/rules_java-5.1.0.tar.gz",
25+
sha256 = "d974a2d6e1a534856d1b60ad6a15e57f3970d8596fbb0bb17b9ee26ca209332a",
3626
)
37-
38-
load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
39-
40-
google_common_workspace_rules()
27+
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
28+
rules_java_dependencies()
29+
rules_java_toolchains()
4130

4231
http_archive(
4332
name = "protobuf_proto_rules",
@@ -54,15 +43,26 @@ load("@protobuf_proto_rules//proto:repositories.bzl", "rules_proto_dependencies"
5443
rules_proto_dependencies()
5544
rules_proto_toolchains()
5645

57-
# From https://github.com/bazelbuild/rules_java/releases/
46+
#
47+
# To update google_bazel_common, locate the git commit to depend on and
48+
# use something like the following to determine the sha256
49+
# curl -L https://github.com/google/bazel-common/archive/<git-commit-id>.zip |
50+
# sha256
51+
#
52+
#
5853
http_archive(
59-
name = "rules_java",
60-
url = "https://github.com/bazelbuild/rules_java/releases/download/5.1.0/rules_java-5.1.0.tar.gz",
61-
sha256 = "d974a2d6e1a534856d1b60ad6a15e57f3970d8596fbb0bb17b9ee26ca209332a",
54+
name = "google_bazel_common",
55+
# output from `sha256sum` on the downloaded zip file
56+
sha256 = "82a49fb27c01ad184db948747733159022f9464fc2e62da996fa700594d9ea42",
57+
strip_prefix = "bazel-common-2a6b6406e12208e02b2060df0631fb30919080f3",
58+
urls = [
59+
"https://github.com/google/bazel-common/archive/2a6b6406e12208e02b2060df0631fb30919080f3.zip",
60+
],
6261
)
63-
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
64-
rules_java_dependencies()
65-
rules_java_toolchains()
62+
63+
load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
64+
65+
google_common_workspace_rules()
6666

6767
# Jarjar is a Google tool (https://github.com/google/jarjar) for generating
6868
# shaded JARs (https://stackoverflow.com/questions/49810578). This repo contains

maven_artifacts.bzl

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ MAVEN_ARTIFACTS = [
1010
"com.google.code.gson:gson:2.9.1",
1111
"com.google.errorprone:error_prone_annotations:2.15.0",
1212
"com.google.guava:failureaccess:1.0.1",
13-
"com.google.guava:guava:32.1.2-jre",
14-
"com.google.guava:guava-testlib:32.1.2-jre",
13+
"com.google.guava:guava:33.0.0-jre",
14+
"com.google.guava:guava-testlib:33.0.0-jre",
1515
"com.google.jimfs:jimfs:1.2",
16-
"com.google.protobuf:protobuf-java:3.21.12",
16+
"com.google.protobuf:protobuf-java:3.25.2",
1717
"com.google.re2j:re2j:1.3",
18-
"com.google.truth.extensions:truth-liteproto-extension:1.1",
19-
"com.google.truth.extensions:truth-proto-extension:1.1",
18+
"com.google.truth.extensions:truth-liteproto-extension:1.3.0",
19+
"com.google.truth.extensions:truth-proto-extension:1.3.0",
2020
"io.github.java-diff-utils:java-diff-utils:4.12",
2121
"org.apache.ant:ant:1.10.11",
2222
"org.jspecify:jspecify:0.2.0",

0 commit comments

Comments
 (0)