Skip to content

Commit

Permalink
Update abseil dependency and reorder dependencies to ensure we use th…
Browse files Browse the repository at this point in the history
…e version specified in protobuf_deps.

PiperOrigin-RevId: 528838071
  • Loading branch information
deannagarcia committed May 2, 2023
1 parent 8b81deb commit 8c4152a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 5 deletions.
21 changes: 18 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ local_repository(
path = "examples",
)

# Load common dependencies first to ensure we use the correct version.
load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
protobuf_deps()


http_archive(
name = "com_google_googletest",
sha256 = "833bfaf9f8f508a4ef4a35e25131112ed55bf9ff5c073e272397ff38eb4d90ec",
Expand All @@ -31,9 +36,19 @@ http_archive(
urls = ["https://github.com/bazelbuild/platforms/archive/da5541f26b7de1dc8e04c075c99df5351742a4a2.zip"], # 2022-05-27
)

# Load common dependencies.
load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
protobuf_deps()
http_archive(
name = "com_google_googletest",
sha256 = "730215d76eace9dd49bf74ce044e8daa065d175f1ac891cc1d6bb184ef94e565",
strip_prefix = "googletest-f53219cdcb7b084ef57414efea92ee5b71989558",
urls = [
"https://github.com/google/googletest/archive/f53219cdcb7b084ef57414efea92ee5b71989558.tar.gz" # 2023-03-16
],
)

load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps")

googletest_deps()
>>>>>>> 99529a220 (Update abseil dependency and reorder dependencies to ensure we use the version specified in protobuf_deps.)

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

Expand Down
4 changes: 2 additions & 2 deletions protobuf_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def protobuf_deps():
_github_archive(
name = "com_google_absl",
repo = "https://github.com/abseil/abseil-cpp",
commit = "78be63686ba732b25052be15f8d6dee891c05749", # Abseil LTS 20230125
sha256 = "4f356a07b9ec06ef51f943928508566e992f621ed5fa4dd588865d7bed1284cd",
commit = "b971ac5250ea8de900eae9f95e06548d14cd95fe", # Abseil LTS 20230125.2
sha256 = "f7c2cb2c5accdcbbbd5c0c59f241a988c0b1da2a3b7134b823c0bd613b1a6880",
)

if not native.existing_rule("zlib"):
Expand Down

0 comments on commit 8c4152a

Please sign in to comment.