Skip to content

Commit df849cc

Browse files
zhangskzzhangskz
authored
Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cpp 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
1 parent 267c421 commit df849cc

File tree

56 files changed

+1076
-1063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1076
-1063
lines changed

‎.github/workflows/test_java.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ jobs:
5454
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75
5555
targets: //java/... //java/internal:java_version //compatibility/...
5656
flags: --noenable_bzlmod
57-
- name: aarch64
58-
cache_key: 'aarch64'
59-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8
60-
targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test
57+
# TODO: b/395623141 - restore this test once runtime uses / emulates aarch64.
58+
# - name: aarch64
59+
# cache_key: 'aarch64'
60+
# image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8
61+
# targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test
6162

6263
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.name }}
6364
runs-on: ubuntu-latest

‎MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module(
1212
# Bzlmod follows MVS:
1313
# https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution
1414
# Thus the highest version in their module graph is resolved.
15-
bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
15+
bazel_dep(name = "abseil-cpp", version = "20250127.0")
1616
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1717
bazel_dep(name = "jsoncpp", version = "1.9.6")
1818
bazel_dep(name = "rules_apple", version = "3.13.0", repo_name = "build_bazel_rules_apple")
@@ -109,7 +109,7 @@ maven.install(
109109
use_repo(maven, "protobuf_maven")
110110

111111
# Development dependencies
112-
bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True, repo_name = "com_google_googletest")
112+
bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True)
113113
bazel_dep(name = "rules_buf", version = "0.3.0", dev_dependency = True)
114114
bazel_dep(name = "rules_testing", version = "0.6.0", dev_dependency = True)
115115
bazel_dep(

‎WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ http_archive(
4242
)
4343

4444
http_archive(
45-
name = "com_google_googletest",
45+
name = "googletest",
4646
sha256 = "7315acb6bf10e99f332c8a43f00d5fbb1ee6ca48c52f6b936991b216c586aaad",
4747
strip_prefix = "googletest-1.15.0",
4848
urls = [
4949
"https://github.com/google/googletest/releases/download/v1.15.0/googletest-1.15.0.tar.gz", # 2024-07-15
5050
],
5151
)
5252

53-
load("@com_google_googletest//:googletest_deps.bzl", "googletest_deps")
53+
load("@googletest//:googletest_deps.bzl", "googletest_deps")
5454

5555
googletest_deps()
5656

‎benchmarks/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ cc_test(
7676
"//upb:mem",
7777
"//upb:reflection",
7878
"//upb:wire",
79+
"@abseil-cpp//absl/container:flat_hash_set",
80+
"@abseil-cpp//absl/log:absl_check",
7981
"@com_github_google_benchmark//:benchmark_main",
80-
"@com_google_absl//absl/container:flat_hash_set",
81-
"@com_google_absl//absl/log:absl_check",
82-
"@com_google_googletest//:gtest",
83-
"@com_google_googletest//:gtest_main",
82+
"@googletest//:gtest",
83+
"@googletest//:gtest_main",
8484
],
8585
)
8686

‎build_defs/BUILD.bazel‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ selects.config_setting_group(
6666
],
6767
)
6868

69+
platform(
70+
name = "aarch64_linux",
71+
constraint_values = [
72+
"@platforms//cpu:aarch64",
73+
"@platforms//os:linux",
74+
],
75+
)
76+
6977
config_setting(
7078
name = "aarch64",
7179
values = {"cpu": "linux-aarch_64"},

‎cmake/dependencies.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if(${CMAKE_VERSION} VERSION_GREATER 3.16 OR ${CMAKE_VERSION} VERSION_EQUAL 3.16)
1010
include_guard()
1111
endif()
1212

13-
set(abseil-cpp-version "20240722.0")
13+
set(abseil-cpp-version "20250127.0")
1414
set(bazel_skylib-version "1.7.1")
1515
set(jsoncpp-version "1.9.6")
1616
set(rules_apple-version "3.13.0")

‎cmake/dependencies_generator.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ def use_extension(self, *args, **kwargs):
9696
def local_path_override(self, *args, **kwargs):
9797
pass
9898

99+
def git_override(self, *args, **kwargs):
100+
pass
101+
99102

100103
class Converter(object):
101104

‎conformance/BUILD.bazel‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ cc_library(
160160
"//src/google/protobuf/util:differencer",
161161
"//src/google/protobuf/util:json_util",
162162
"//src/google/protobuf/util:type_resolver",
163-
"@com_google_absl//absl/container:btree",
164-
"@com_google_absl//absl/container:flat_hash_set",
165-
"@com_google_absl//absl/log:absl_check",
166-
"@com_google_absl//absl/log:absl_log",
167-
"@com_google_absl//absl/status",
168-
"@com_google_absl//absl/strings",
169-
"@com_google_absl//absl/strings:str_format",
170-
"@com_google_absl//absl/types:optional",
163+
"@abseil-cpp//absl/container:btree",
164+
"@abseil-cpp//absl/container:flat_hash_set",
165+
"@abseil-cpp//absl/log:absl_check",
166+
"@abseil-cpp//absl/log:absl_log",
167+
"@abseil-cpp//absl/status",
168+
"@abseil-cpp//absl/strings",
169+
"@abseil-cpp//absl/strings:str_format",
170+
"@abseil-cpp//absl/types:optional",
171171
],
172172
)
173173

@@ -176,12 +176,12 @@ cc_test(
176176
srcs = ["failure_list_trie_node_test.cc"],
177177
deps = [
178178
":conformance_test",
179-
"@com_google_absl//absl/status",
180-
"@com_google_absl//absl/status:statusor",
181-
"@com_google_absl//absl/strings",
182-
"@com_google_absl//absl/types:optional",
183-
"@com_google_googletest//:gtest",
184-
"@com_google_googletest//:gtest_main",
179+
"@abseil-cpp//absl/status",
180+
"@abseil-cpp//absl/status:statusor",
181+
"@abseil-cpp//absl/strings",
182+
"@abseil-cpp//absl/types:optional",
183+
"@googletest//:gtest",
184+
"@googletest//:gtest_main",
185185
],
186186
)
187187

@@ -208,12 +208,12 @@ cc_library(
208208
"//src/google/protobuf:protobuf_lite",
209209
"//src/google/protobuf/json",
210210
"//src/google/protobuf/util:type_resolver",
211-
"@com_google_absl//absl/log:absl_check",
212-
"@com_google_absl//absl/log:absl_log",
213-
"@com_google_absl//absl/log:die_if_null",
214-
"@com_google_absl//absl/status",
215-
"@com_google_absl//absl/strings",
216-
"@com_google_absl//absl/strings:str_format",
211+
"@abseil-cpp//absl/log:absl_check",
212+
"@abseil-cpp//absl/log:absl_log",
213+
"@abseil-cpp//absl/log:die_if_null",
214+
"@abseil-cpp//absl/status",
215+
"@abseil-cpp//absl/strings",
216+
"@abseil-cpp//absl/strings:str_format",
217217
"@jsoncpp",
218218
],
219219
)
@@ -231,10 +231,10 @@ cc_library(
231231
"//editions:test_messages_proto2_editions_cc_proto",
232232
"//editions:test_messages_proto3_editions_cc_proto",
233233
"//src/google/protobuf",
234-
"@com_google_absl//absl/log:absl_log",
235-
"@com_google_absl//absl/log:die_if_null",
236-
"@com_google_absl//absl/strings",
237-
"@com_google_absl//absl/strings:str_format",
234+
"@abseil-cpp//absl/log:absl_log",
235+
"@abseil-cpp//absl/log:die_if_null",
236+
"@abseil-cpp//absl/strings",
237+
"@abseil-cpp//absl/strings:str_format",
238238
],
239239
)
240240

@@ -247,7 +247,7 @@ cc_binary(
247247
":binary_json_conformance_suite",
248248
":conformance_test",
249249
":text_format_conformance_suite",
250-
"@com_google_absl//absl/strings:str_format",
250+
"@abseil-cpp//absl/strings:str_format",
251251
],
252252
)
253253

@@ -271,11 +271,11 @@ cc_binary(
271271
"//src/google/protobuf/stubs",
272272
"//src/google/protobuf/util:json_util",
273273
"//src/google/protobuf/util:type_resolver",
274-
"@com_google_absl//absl/log:absl_check",
275-
"@com_google_absl//absl/log:absl_log",
276-
"@com_google_absl//absl/status",
277-
"@com_google_absl//absl/status:statusor",
278-
"@com_google_absl//absl/strings",
274+
"@abseil-cpp//absl/log:absl_check",
275+
"@abseil-cpp//absl/log:absl_log",
276+
"@abseil-cpp//absl/status",
277+
"@abseil-cpp//absl/status:statusor",
278+
"@abseil-cpp//absl/strings",
279279
],
280280
)
281281

‎editions/BUILD‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ cc_binary(
7878
visibility = ["//visibility:public"],
7979
deps = [
8080
"//src/google/protobuf",
81-
"@com_google_absl//absl/flags:flag",
82-
"@com_google_absl//absl/flags:parse",
83-
"@com_google_absl//absl/log:absl_log",
84-
"@com_google_absl//absl/strings",
81+
"@abseil-cpp//absl/flags:flag",
82+
"@abseil-cpp//absl/flags:parse",
83+
"@abseil-cpp//absl/log:absl_log",
84+
"@abseil-cpp//absl/strings",
8585
],
8686
)
8787

@@ -114,14 +114,14 @@ cc_test(
114114
"//src/google/protobuf/stubs",
115115
"//src/google/protobuf/testing",
116116
"//src/google/protobuf/testing:file",
117+
"@abseil-cpp//absl/memory",
118+
"@abseil-cpp//absl/status",
119+
"@abseil-cpp//absl/status:statusor",
120+
"@abseil-cpp//absl/strings",
121+
"@abseil-cpp//absl/strings:string_view",
117122
"@bazel_tools//tools/cpp/runfiles",
118-
"@com_google_absl//absl/memory",
119-
"@com_google_absl//absl/status",
120-
"@com_google_absl//absl/status:statusor",
121-
"@com_google_absl//absl/strings",
122-
"@com_google_absl//absl/strings:string_view",
123-
"@com_google_googletest//:gtest",
124-
"@com_google_googletest//:gtest_main",
123+
"@googletest//:gtest",
124+
"@googletest//:gtest_main",
125125
],
126126
)
127127

@@ -311,8 +311,8 @@ cc_test(
311311
":test_messages_proto3_editions_cc_proto",
312312
"//src/google/protobuf",
313313
"//src/google/protobuf:test_textproto",
314-
"@com_google_googletest//:gtest",
315-
"@com_google_googletest//:gtest_main",
314+
"@googletest//:gtest",
315+
"@googletest//:gtest_main",
316316
],
317317
)
318318

@@ -321,8 +321,8 @@ cc_test(
321321
srcs = ["generated_reflection_test.cc"],
322322
deps = [
323323
":test_messages_proto2_editions_cc_proto",
324-
"@com_google_googletest//:gtest",
325-
"@com_google_googletest//:gtest_main",
324+
"@googletest//:gtest",
325+
"@googletest//:gtest_main",
326326
],
327327
)
328328

‎hpb/bazel/hpb_proto_library.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ _upb_cc_proto_library_aspect = aspect(
156156
# TODO: Add dependencies for cc runtime (absl/string etc..)
157157
"//upb:generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
158158
"//hpb:generated_hpb_support",
159-
"@com_google_absl//absl/log:absl_check",
160-
"@com_google_absl//absl/strings",
161-
"@com_google_absl//absl/status:statusor",
159+
"@abseil-cpp//absl/log:absl_check",
160+
"@abseil-cpp//absl/strings",
161+
"@abseil-cpp//absl/status:statusor",
162162
"//hpb:repeated_field",
163163
],
164164
),

0 commit comments

Comments
 (0)