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 authored and copybara-github committed May 2, 2023
1 parent 47c1998 commit 99529a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ 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()

# Bazel platform rules.
http_archive(
name = "platforms",
Expand All @@ -28,10 +32,6 @@ load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps")

googletest_deps()

# Load common dependencies.
load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
protobuf_deps()

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

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 @@ -42,8 +42,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 99529a2

Please sign in to comment.