Merge pull request #12638 from deannagarcia/23.x

Update abseil dependency and reorder dependencies to ensure we use th…
deannagarcia-patch-6
deannagarcia 2 years ago committed by GitHub
commit e01953476c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      WORKSPACE
  2. 4
      protobuf_deps.bzl

@ -7,6 +7,10 @@ local_repository(
path = "examples", 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. # Bazel platform rules.
http_archive( http_archive(
name = "platforms", name = "platforms",
@ -28,10 +32,6 @@ load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps")
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") load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
rules_jvm_external_deps() rules_jvm_external_deps()

@ -42,8 +42,8 @@ def protobuf_deps():
_github_archive( _github_archive(
name = "com_google_absl", name = "com_google_absl",
repo = "https://github.com/abseil/abseil-cpp", repo = "https://github.com/abseil/abseil-cpp",
commit = "78be63686ba732b25052be15f8d6dee891c05749", # Abseil LTS 20230125 commit = "b971ac5250ea8de900eae9f95e06548d14cd95fe", # Abseil LTS 20230125.2
sha256 = "4f356a07b9ec06ef51f943928508566e992f621ed5fa4dd588865d7bed1284cd", sha256 = "f7c2cb2c5accdcbbbd5c0c59f241a988c0b1da2a3b7134b823c0bd613b1a6880",
) )
if not native.existing_rule("zlib"): if not native.existing_rule("zlib"):

Loading…
Cancel
Save