Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cp…

…p and com_google_googletest -> @googletest canonical BCR names. (#20295) Users still using the old `WORKSPACE` system may need to do the same or use `repo_mapping` on repositories that still use the old names. See Abseil's release notes for details: https://github.com/abseil/abseil-cpp/releases/tag/20250127. PiperOrigin-RevId: 725247849
protocolbuffers · Feb 10, 2025 · df849cc · df849cc
1 parent 267c421
commit df849cc
Show file tree

Hide file tree

Showing 56 changed files with 1,076 additions and 1,063 deletions.
diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
@@ -54,10 +54,11 @@ jobs:
             image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75
             targets: //java/... //java/internal:java_version //compatibility/...
             flags: --noenable_bzlmod
-          - name: aarch64
-            cache_key: 'aarch64'
-            image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8
-            targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test
+          # TODO: b/395623141 - restore this test once runtime uses / emulates aarch64.
+          # - name: aarch64
+          #   cache_key: 'aarch64'
+          #   image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8
+          #   targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test
 
     name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name }}
     runs-on: ubuntu-latest

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -12,7 +12,7 @@ module(
 # Bzlmod follows MVS:
 # https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution
 # Thus the highest version in their module graph is resolved.
-bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
+bazel_dep(name = "abseil-cpp", version = "20250127.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "jsoncpp", version = "1.9.6")
 bazel_dep(name = "rules_apple", version = "3.13.0", repo_name = "build_bazel_rules_apple")
@@ -109,7 +109,7 @@ maven.install(
 use_repo(maven, "protobuf_maven")
 
 # Development dependencies
-bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True, repo_name = "com_google_googletest")
+bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True)
 bazel_dep(name = "rules_buf", version = "0.3.0", dev_dependency = True)
 bazel_dep(name = "rules_testing", version = "0.6.0", dev_dependency = True)
 bazel_dep(

diff --git a/WORKSPACE b/WORKSPACE
@@ -42,15 +42,15 @@ http_archive(
 )
 
 http_archive(
-    name = "com_google_googletest",
+    name = "googletest",
     sha256 = "7315acb6bf10e99f332c8a43f00d5fbb1ee6ca48c52f6b936991b216c586aaad",
     strip_prefix = "googletest-1.15.0",
     urls = [
         "https://github.com/google/googletest/releases/download/v1.15.0/googletest-1.15.0.tar.gz",  # 2024-07-15
     ],
 )
 
-load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps")
+load("@googletest//:googletest_deps.bzl", "googletest_deps")
 
 googletest_deps()
 

diff --git a/benchmarks/BUILD b/benchmarks/BUILD
@@ -76,11 +76,11 @@ cc_test(
         "//upb:mem",
         "//upb:reflection",
         "//upb:wire",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/log:absl_check",
         "@com_github_google_benchmark//:benchmark_main",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 )
 

diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel
@@ -66,6 +66,14 @@ selects.config_setting_group(
     ],
 )
 
+platform(
+    name = "aarch64_linux",
+    constraint_values = [
+        "@platforms//cpu:aarch64",
+        "@platforms//os:linux",
+    ],
+)
+
 config_setting(
     name = "aarch64",
     values = {"cpu": "linux-aarch_64"},

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -10,7 +10,7 @@ if(${CMAKE_VERSION} VERSION_GREATER 3.16 OR ${CMAKE_VERSION} VERSION_EQUAL 3.16)
   include_guard()
 endif()
 
-set(abseil-cpp-version "20240722.0")
+set(abseil-cpp-version "20250127.0")
 set(bazel_skylib-version "1.7.1")
 set(jsoncpp-version "1.9.6")
 set(rules_apple-version "3.13.0")

diff --git a/cmake/dependencies_generator.py b/cmake/dependencies_generator.py
@@ -96,6 +96,9 @@ def use_extension(self, *args, **kwargs):
   def local_path_override(self, *args, **kwargs):
     pass
 
+  def git_override(self, *args, **kwargs):
+    pass
+
 
 class Converter(object):
 

diff --git a/conformance/BUILD.bazel b/conformance/BUILD.bazel
@@ -160,14 +160,14 @@ cc_library(
         "//src/google/protobuf/util:differencer",
         "//src/google/protobuf/util:json_util",
         "//src/google/protobuf/util:type_resolver",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
-        "@com_google_absl//absl/types:optional",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/log:absl_check",
+        "@abseil-cpp//absl/log:absl_log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
+        "@abseil-cpp//absl/types:optional",
     ],
 )
 
@@ -176,12 +176,12 @@ cc_test(
     srcs = ["failure_list_trie_node_test.cc"],
     deps = [
         ":conformance_test",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:optional",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:optional",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -208,12 +208,12 @@ cc_library(
         "//src/google/protobuf:protobuf_lite",
         "//src/google/protobuf/json",
         "//src/google/protobuf/util:type_resolver",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/log:die_if_null",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/log:absl_check",
+        "@abseil-cpp//absl/log:absl_log",
+        "@abseil-cpp//absl/log:die_if_null",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
         "@jsoncpp",
     ],
 )
@@ -231,10 +231,10 @@ cc_library(
         "//editions:test_messages_proto2_editions_cc_proto",
         "//editions:test_messages_proto3_editions_cc_proto",
         "//src/google/protobuf",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/log:die_if_null",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/log:absl_log",
+        "@abseil-cpp//absl/log:die_if_null",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
     ],
 )
 
@@ -247,7 +247,7 @@ cc_binary(
         ":binary_json_conformance_suite",
         ":conformance_test",
         ":text_format_conformance_suite",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/strings:str_format",
     ],
 )
 
@@ -271,11 +271,11 @@ cc_binary(
         "//src/google/protobuf/stubs",
         "//src/google/protobuf/util:json_util",
         "//src/google/protobuf/util:type_resolver",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/log:absl_check",
+        "@abseil-cpp//absl/log:absl_log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
     ],
 )
 

diff --git a/editions/BUILD b/editions/BUILD
@@ -78,10 +78,10 @@ cc_binary(
     visibility = ["//visibility:public"],
     deps = [
         "//src/google/protobuf",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/flags:parse",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/flags:parse",
+        "@abseil-cpp//absl/log:absl_log",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -114,14 +114,14 @@ cc_test(
         "//src/google/protobuf/stubs",
         "//src/google/protobuf/testing",
         "//src/google/protobuf/testing:file",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:string_view",
         "@bazel_tools//tools/cpp/runfiles",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:string_view",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -311,8 +311,8 @@ cc_test(
         ":test_messages_proto3_editions_cc_proto",
         "//src/google/protobuf",
         "//src/google/protobuf:test_textproto",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -321,8 +321,8 @@ cc_test(
     srcs = ["generated_reflection_test.cc"],
     deps = [
         ":test_messages_proto2_editions_cc_proto",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 )
 

diff --git a/hpb/bazel/hpb_proto_library.bzl b/hpb/bazel/hpb_proto_library.bzl
@@ -156,9 +156,9 @@ _upb_cc_proto_library_aspect = aspect(
                 # TODO: Add dependencies for cc runtime (absl/string etc..)
                 "//upb:generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
                 "//hpb:generated_hpb_support",
-                "@com_google_absl//absl/log:absl_check",
-                "@com_google_absl//absl/strings",
-                "@com_google_absl//absl/status:statusor",
+                "@abseil-cpp//absl/log:absl_check",
+                "@abseil-cpp//absl/strings",
+                "@abseil-cpp//absl/status:statusor",
                 "//hpb:repeated_field",
             ],
         ),

diff --git a/lua/BUILD.bazel b/lua/BUILD.bazel
@@ -48,7 +48,7 @@ cc_binary(
         "//src/google/protobuf",
         "//src/google/protobuf/compiler:code_generator",
         "//src/google/protobuf/io:printer",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
     ],
 )
 

diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl
@@ -79,12 +79,12 @@ def protobuf_deps():
             ],
         )
 
-    if not native.existing_rule("com_google_absl"):
+    if not native.existing_rule("abseil-cpp"):
         _github_archive(
-            name = "com_google_absl",
+            name = "abseil-cpp",
             repo = "https://github.com/abseil/abseil-cpp",
-            commit = "4447c7562e3bc702ade25105912dce503f0c4010",  # Abseil LTS 20240722.0
-            sha256 = "d8342ad77aa9e16103c486b615460c24a695a1f04cdb760eb02fef780df99759",
+            commit = "9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f",  # Abseil LTS 20250127
+            sha256 = "d8ae9aa794a571ee39c77085ee69f1d4ac276212a7d99734974d95df7baa8d13",
         )
 
     if not native.existing_rule("zlib"):

diff --git a/python/build_targets.bzl b/python/build_targets.bzl
@@ -146,12 +146,12 @@ def build_targets(name):
             "//src/google/protobuf/io:tokenizer",
             "//src/google/protobuf/stubs:lite",
             "//src/google/protobuf/util:differencer",
-            "@com_google_absl//absl/container:flat_hash_map",
-            "@com_google_absl//absl/log:absl_check",
-            "@com_google_absl//absl/log:absl_log",
-            "@com_google_absl//absl/status",
-            "@com_google_absl//absl/status:statusor",
-            "@com_google_absl//absl/strings",
+            "@abseil-cpp//absl/container:flat_hash_map",
+            "@abseil-cpp//absl/log:absl_check",
+            "@abseil-cpp//absl/log:absl_log",
+            "@abseil-cpp//absl/status",
+            "@abseil-cpp//absl/status:statusor",
+            "@abseil-cpp//absl/strings",
         ] + select({
             "//conditions:default": [],
             ":use_fast_cpp_protos": ["@system_python//:python_headers"],
@@ -458,8 +458,8 @@ def build_targets(name):
         deps = [
             "//src/google/protobuf",
             "//src/google/protobuf/io",
-            "@com_google_absl//absl/log:absl_check",
-            "@com_google_absl//absl/status",
+            "@abseil-cpp//absl/log:absl_check",
+            "@abseil-cpp//absl/status",
             "@system_python//:python_headers",
         ],
     )

diff --git a/rust/cpp_kernel/BUILD b/rust/cpp_kernel/BUILD
@@ -28,10 +28,10 @@ cc_library(
         "//src/google/protobuf",
         "//src/google/protobuf:protobuf_lite",
         "//src/google/protobuf/io",
-        "@com_google_absl//absl/functional:overload",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/log:absl_log",
-        "@com_google_absl//absl/strings:string_view",
+        "@abseil-cpp//absl/functional:overload",
+        "@abseil-cpp//absl/log:absl_check",
+        "@abseil-cpp//absl/log:absl_log",
+        "@abseil-cpp//absl/strings:string_view",
     ],
 )
 

diff --git a/rust/test/cpp/interop/BUILD b/rust/test/cpp/interop/BUILD
@@ -13,8 +13,8 @@ cc_library(
     deps = [
         ":interop_test_cc_proto",
         "//rust/cpp_kernel:cpp_api",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/log:absl_check",
+        "@abseil-cpp//absl/strings",
     ],
 )
 

diff --git a/rust/test/shared/utf8/BUILD b/rust/test/shared/utf8/BUILD
@@ -42,9 +42,9 @@ cc_test(
         ":feature_verify_cc_proto",
         ":no_features_proto2_cc_proto",
         ":no_features_proto3_cc_proto",
-        "@com_google_absl//absl/strings:string_view",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
+        "@abseil-cpp//absl/strings:string_view",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,9 @@ def use_extension(self, *args, **kwargs): @@
       def local_path_override(self, *args, **kwargs):
         pass
+      def git_override(self, *args, **kwargs):
+        pass
     class Converter(object):
@@ Expand Down @@