Skip to content

Commit 8c4152a

Browse files
committed
Update abseil dependency and reorder dependencies to ensure we use the version specified in protobuf_deps.
PiperOrigin-RevId: 528838071
1 parent 8b81deb commit 8c4152a

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

WORKSPACE

+18-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ local_repository(
77
path = "examples",
88
)
99

10+
# Load common dependencies first to ensure we use the correct version.
11+
load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
12+
protobuf_deps()
13+
14+
1015
http_archive(
1116
name = "com_google_googletest",
1217
sha256 = "833bfaf9f8f508a4ef4a35e25131112ed55bf9ff5c073e272397ff38eb4d90ec",
@@ -31,9 +36,19 @@ http_archive(
3136
urls = ["https://github.com/bazelbuild/platforms/archive/da5541f26b7de1dc8e04c075c99df5351742a4a2.zip"], # 2022-05-27
3237
)
3338

34-
# Load common dependencies.
35-
load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
36-
protobuf_deps()
39+
http_archive(
40+
name = "com_google_googletest",
41+
sha256 = "730215d76eace9dd49bf74ce044e8daa065d175f1ac891cc1d6bb184ef94e565",
42+
strip_prefix = "googletest-f53219cdcb7b084ef57414efea92ee5b71989558",
43+
urls = [
44+
"https://github.com/google/googletest/archive/f53219cdcb7b084ef57414efea92ee5b71989558.tar.gz" # 2023-03-16
45+
],
46+
)
47+
48+
load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps")
49+
50+
googletest_deps()
51+
>>>>>>> 99529a220 (Update abseil dependency and reorder dependencies to ensure we use the version specified in protobuf_deps.)
3752

3853
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
3954

protobuf_deps.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def protobuf_deps():
4040
_github_archive(
4141
name = "com_google_absl",
4242
repo = "https://github.com/abseil/abseil-cpp",
43-
commit = "78be63686ba732b25052be15f8d6dee891c05749", # Abseil LTS 20230125
44-
sha256 = "4f356a07b9ec06ef51f943928508566e992f621ed5fa4dd588865d7bed1284cd",
43+
commit = "b971ac5250ea8de900eae9f95e06548d14cd95fe", # Abseil LTS 20230125.2
44+
sha256 = "f7c2cb2c5accdcbbbd5c0c59f241a988c0b1da2a3b7134b823c0bd613b1a6880",
4545
)
4646

4747
if not native.existing_rule("zlib"):

0 commit comments

Comments
 (0)