From 13b34b163572a2c770e7607c542d3a9534a4a5c8 Mon Sep 17 00:00:00 2001 From: Sandy Zhang Date: Mon, 10 Feb 2025 09:40:27 -0800 Subject: [PATCH 1/2] Upgrade abseil-cpp to 20250127 and use @com_google_absl -> @abseil-cpp and com_google_googletest -> @googletest canonical BCR names. 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 --- .github/workflows/test_java.yml | 9 +- MODULE.bazel | 4 +- WORKSPACE | 4 +- benchmarks/BUILD | 8 +- build_defs/BUILD.bazel | 8 + cmake/dependencies_generator.py | 3 + conformance/BUILD.bazel | 60 +- editions/BUILD | 30 +- hpb/bazel/hpb_proto_library.bzl | 6 +- lua/BUILD.bazel | 2 +- protobuf_deps.bzl | 8 +- python/build_targets.bzl | 16 +- rust/cpp_kernel/BUILD | 8 +- rust/test/cpp/interop/BUILD | 4 +- rust/test/shared/utf8/BUILD | 6 +- src/google/protobuf/BUILD.bazel | 618 +++++++++--------- src/google/protobuf/compiler/BUILD.bazel | 170 ++--- src/google/protobuf/compiler/cpp/BUILD.bazel | 134 ++-- .../protobuf/compiler/csharp/BUILD.bazel | 22 +- src/google/protobuf/compiler/java/BUILD.bazel | 74 +-- .../protobuf/compiler/java/full/BUILD.bazel | 26 +- .../protobuf/compiler/java/lite/BUILD.bazel | 16 +- .../protobuf/compiler/kotlin/BUILD.bazel | 10 +- .../protobuf/compiler/objectivec/BUILD.bazel | 40 +- src/google/protobuf/compiler/php/BUILD.bazel | 14 +- .../protobuf/compiler/python/BUILD.bazel | 24 +- src/google/protobuf/compiler/ruby/BUILD.bazel | 10 +- src/google/protobuf/compiler/rust/BUILD.bazel | 112 ++-- .../compiler/rust/accessors/BUILD.bazel | 8 +- src/google/protobuf/io/BUILD.bazel | 110 ++-- src/google/protobuf/json/BUILD.bazel | 156 ++--- src/google/protobuf/stubs/BUILD.bazel | 22 +- src/google/protobuf/testing/BUILD.bazel | 24 +- src/google/protobuf/util/BUILD.bazel | 80 +-- third_party/utf8_range/BUILD.bazel | 8 +- toolchain/toolchains.bazelrc | 5 +- upb/base/BUILD | 4 +- upb/hash/BUILD | 6 +- upb/io/BUILD | 16 +- upb/json/BUILD | 8 +- upb/lex/BUILD | 10 +- upb/mem/BUILD | 18 +- upb/message/BUILD | 46 +- upb/mini_descriptor/BUILD | 6 +- upb/mini_table/BUILD | 10 +- upb/reflection/BUILD | 6 +- upb/test/BUILD | 30 +- upb/text/BUILD | 6 +- upb/util/BUILD | 14 +- upb/wire/BUILD | 8 +- upb_generator/BUILD | 16 +- upb_generator/c/BUILD | 22 +- upb_generator/common/BUILD | 8 +- upb_generator/minitable/BUILD | 30 +- upb_generator/reflection/BUILD | 14 +- 55 files changed, 1075 insertions(+), 1062 deletions(-) diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml index 8e08b128a982a..94dff1471e035 100644 --- 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 index 5b4bfc5124003..132a4e9a11008 100644 --- 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 index d7e76c5186e63..9587fb5cfa6c4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -42,7 +42,7 @@ http_archive( ) http_archive( - name = "com_google_googletest", + name = "googletest", sha256 = "7315acb6bf10e99f332c8a43f00d5fbb1ee6ca48c52f6b936991b216c586aaad", strip_prefix = "googletest-1.15.0", urls = [ @@ -50,7 +50,7 @@ http_archive( ], ) -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 index ce253957adb4e..3fbffb5379653 100644 --- 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 index 268ecbb65c3be..87f0b8481c8f0 100644 --- 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_generator.py b/cmake/dependencies_generator.py index e31b7e0bc273e..4cca0b74ad64d 100644 --- 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 index 80fde6ab17855..3430b0eb19448 100644 --- 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 index 4c5fb78982ea7..3d383d9cd3e91 100644 --- 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 index dded81a808b81..f123950452ba6 100644 --- 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 index b464e234c4261..692d6708fb9f5 100644 --- 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 index d5d255bfdba4e..d3bc41446756c 100644 --- 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 index 66ffb9b6e0ce2..b62d5f05db9cf 100644 --- 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 index ad4580701cf5c..e53fc4505457e 100644 --- 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 index 8ad160a11291e..9517649b19641 100644 --- 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 index 6f5ee3b2b79c1..843b7ad6cc8c2 100644 --- 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", ], ) diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel index be537200b7661..4f63c6ad4ae0e 100644 --- a/src/google/protobuf/BUILD.bazel +++ b/src/google/protobuf/BUILD.bazel @@ -276,14 +276,14 @@ cc_library( "//src/google/protobuf:__subpackages__", ], deps = [ - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:prefetch", - "@com_google_absl//absl/meta:type_traits", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:prefetch", + "@abseil-cpp//absl/meta:type_traits", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:variant", ], ) @@ -298,7 +298,7 @@ cc_library( ], deps = [ ":port", - "@com_google_absl//absl/base:core_headers", + "@abseil-cpp//absl/base:core_headers", ], ) @@ -308,9 +308,9 @@ cc_test( deps = [ ":port", ":varint_shuffle", - "@com_google_absl//absl/log:absl_check", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -335,12 +335,12 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:string_view", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:string_view", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -350,10 +350,10 @@ cc_test( deps = [ ":port", ":varint_shuffle", - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/log:absl_check", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/log:absl_check", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -369,10 +369,10 @@ cc_library( deps = [ ":port", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/numeric:bits", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/numeric:bits", ], ) @@ -385,8 +385,8 @@ cc_library( "//src/google/protobuf:__subpackages__", ], deps = [ - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:prefetch", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:prefetch", ], ) @@ -409,8 +409,8 @@ cc_library( strip_include_prefix = "/src", deps = [ ":arena_align", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log:absl_check", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/log:absl_check", ], ) @@ -420,8 +420,8 @@ cc_test( deps = [ ":port", ":string_block", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -448,16 +448,16 @@ cc_library( ":port", ":string_block", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:dynamic_annotations", - "@com_google_absl//absl/base:prefetch", - "@com_google_absl//absl/container:layout", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/utility:if_constexpr", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:dynamic_annotations", + "@abseil-cpp//absl/base:prefetch", + "@abseil-cpp//absl/container:layout", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/utility:if_constexpr", ], ) @@ -562,29 +562,29 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/stubs:lite", "//third_party/utf8_range:utf8_validity", - "@com_google_absl//absl/base", - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:dynamic_annotations", - "@com_google_absl//absl/base:prefetch", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:overload", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/meta:type_traits", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:internal", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/utility:if_constexpr", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:dynamic_annotations", + "@abseil-cpp//absl/base:prefetch", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/functional:overload", + "@abseil-cpp//absl/hash", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/meta:type_traits", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:internal", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/utility:if_constexpr", ], ) @@ -660,36 +660,36 @@ cc_library( "//src/google/protobuf/io:tokenizer", "//src/google/protobuf/stubs", "//third_party/utf8_range:utf8_validity", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/base", - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:dynamic_annotations", - "@com_google_absl//absl/cleanup", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:fixed_array", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/functional:overload", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:internal", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", - "@com_google_absl//absl/utility", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:dynamic_annotations", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:fixed_array", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/functional:any_invocable", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/functional:overload", + "@abseil-cpp//absl/hash", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:internal", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", + "@abseil-cpp//absl/utility", ], ) @@ -737,8 +737,8 @@ cc_test( copts = COPTS, deps = [ ":protobuf_lite", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1186,9 +1186,9 @@ cc_test( ":port", ":protobuf", ":unittest_string_view_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", ], ) @@ -1236,10 +1236,10 @@ cc_library( ":port", ":test_util2", "//src/google/protobuf/io", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", ], ) @@ -1280,12 +1280,12 @@ cc_library( ":test_textproto", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_googletest//:gtest", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@googletest//:gtest", ], ) @@ -1299,7 +1299,7 @@ cc_library( deps = [ "//src/google/protobuf/io", "//src/google/protobuf/util:differencer", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -1312,10 +1312,10 @@ cc_test( ":port", ":protobuf", ":test_util", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1330,8 +1330,8 @@ cc_test( }), deps = [ ":arena_align", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1354,13 +1354,13 @@ cc_test( ":protobuf_lite", ":test_util", "//src/google/protobuf/io", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/utility", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/utility", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1373,10 +1373,10 @@ cc_test( ":protobuf_lite", "//src/google/protobuf/io", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1389,13 +1389,13 @@ cc_test( ":port", ":protobuf", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/time", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1407,8 +1407,8 @@ cc_test( ":test_textproto", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1435,22 +1435,22 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/base:log_severity", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/functional:any_invocable", - "@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/log:scoped_mock_log", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base:log_severity", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/functional:any_invocable", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:die_if_null", + "@abseil-cpp//absl/log:scoped_mock_log", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1466,9 +1466,9 @@ cc_library( ], deps = [ ":protobuf", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/memory", - "@com_google_googletest//:gtest", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/memory", + "@googletest//:gtest", ], ) @@ -1479,8 +1479,8 @@ cc_test( ":cc_test_protos", ":protobuf", ":protobuf_lite", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1500,8 +1500,8 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1526,11 +1526,11 @@ cc_test( "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", "//src/google/protobuf/util:differencer", - "@com_google_absl//absl/base", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1550,15 +1550,15 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@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/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:die_if_null", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1581,12 +1581,12 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1606,13 +1606,13 @@ cc_test( ":protobuf", ":protobuf_lite", "//src/google/protobuf/io", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1626,10 +1626,10 @@ cc_test( ":protobuf_lite", "//src/google/protobuf/io", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1646,8 +1646,8 @@ cc_test( ":lite_test_util", ":protobuf", ":test_util", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1662,10 +1662,10 @@ cc_test( ":protobuf_lite", "//src/google/protobuf/io", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1681,13 +1681,13 @@ cc_test( ":protobuf_lite", ":test_util", "//src/google/protobuf/stubs", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1721,17 +1721,17 @@ cc_test( "//src/google/protobuf/testing:file", "//src/google/protobuf/util:differencer", "//src/google/protobuf/util:time_util", - "@com_google_absl//absl/base", - "@com_google_absl//absl/cleanup", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@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/strings", - "@com_google_absl//absl/time", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1759,14 +1759,14 @@ cc_test( "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", "//src/google/protobuf/util:differencer", - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/hash:hash_testing", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:scoped_mock_log", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/hash:hash_testing", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:scoped_mock_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1792,13 +1792,13 @@ cc_test( "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", "//src/google/protobuf/util:differencer", - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:scoped_mock_log", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:scoped_mock_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1808,12 +1808,12 @@ cc_test( deps = [ ":cc_test_protos", ":protobuf", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:string_view", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:string_view", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1823,12 +1823,12 @@ cc_test( deps = [ ":cc_test_protos", ":protobuf", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:string_view", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:string_view", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1838,8 +1838,8 @@ cc_test( deps = [ ":cc_test_protos", ":protobuf", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1854,8 +1854,8 @@ cc_test( ":unittest_proto3_arena_cc_proto", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1879,10 +1879,10 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1906,8 +1906,8 @@ cc_test( ":unittest_proto3_cc_proto", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1927,9 +1927,9 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1951,10 +1951,10 @@ cc_test( ":protobuf", ":test_util", "//src/google/protobuf/stubs", - "@com_google_absl//absl/base", - "@com_google_absl//absl/strings:cord", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/strings:cord", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -1978,15 +1978,15 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/base:config", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/random", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base:config", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/random", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/types:span", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2014,14 +2014,14 @@ cc_test( "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", "//third_party/utf8_range:utf8_validity", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:die_if_null", - "@com_google_absl//absl/log:scoped_mock_log", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:str_format", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:die_if_null", + "@abseil-cpp//absl/log:scoped_mock_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:str_format", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2043,14 +2043,14 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/functional:bind_front", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/time", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2069,8 +2069,8 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2093,13 +2093,13 @@ cc_test( "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", "//src/google/protobuf/util:differencer", - "@com_google_absl//absl/base", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:scoped_mock_log", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:scoped_mock_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2110,11 +2110,11 @@ cc_test( ":port", ":protobuf", ":protobuf_lite", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:span", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2129,9 +2129,9 @@ cc_test( "//src/google/protobuf/io", "//src/google/protobuf/io:tokenizer", "//src/google/protobuf/util:differencer", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2140,8 +2140,8 @@ cc_test( srcs = ["reflection_mode_test.cc"], deps = [ ":protobuf", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2151,9 +2151,9 @@ cc_test( deps = [ ":cc_test_protos", ":protobuf", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2178,8 +2178,8 @@ cc_test( ":cc_test_protos", ":protobuf", ":unredacted_debug_format_for_test", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -2258,6 +2258,6 @@ cc_library( ], deps = [ ":port", - "@com_google_absl//absl/base:config", + "@abseil-cpp//absl/base:config", ], ) diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel index 2088f89efe685..1b1a4ba5b49ba 100644 --- a/src/google/protobuf/compiler/BUILD.bazel +++ b/src/google/protobuf/compiler/BUILD.bazel @@ -66,15 +66,15 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/io:io_win32", "//src/google/protobuf/io:tokenizer", - "@com_google_absl//absl/base", - "@com_google_absl//absl/cleanup", - "@com_google_absl//absl/container:flat_hash_map", - "@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/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -102,13 +102,13 @@ cc_library( "//src/google/protobuf/compiler:retention", "//src/google/protobuf/io", "//src/google/protobuf/io:io_win32", - "@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/memory", - "@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/memory", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -130,7 +130,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//src/google/protobuf:port", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -150,8 +150,8 @@ cc_library( deps = [ ":code_generator", "//src/google/protobuf:port", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", ], ) @@ -162,9 +162,9 @@ cc_test( deps = [ ":versions", "//src/google/protobuf:test_textproto", - "@com_google_absl//absl/memory", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/memory", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -194,21 +194,21 @@ cc_library( "//src/google/protobuf/io:io_win32", "//src/google/protobuf/io:printer", "//src/google/protobuf/stubs", - "@com_google_absl//absl/algorithm", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:log_severity", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@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/log:globals", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/algorithm", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:log_severity", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:globals", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:span", ], ) @@ -238,7 +238,7 @@ cc_library( "//src/google/protobuf/compiler/python", "//src/google/protobuf/compiler/ruby", "//src/google/protobuf/compiler/rust", - "@com_google_absl//absl/log:initialize", + "@abseil-cpp//absl/log:initialize", ], ) @@ -255,7 +255,7 @@ cc_binary( deps = [ ":command_line_interface", "//src/google/protobuf:port", - "@com_google_absl//absl/log:initialize", + "@abseil-cpp//absl/log:initialize", ], ) @@ -299,10 +299,10 @@ cc_library( "//src/google/protobuf/io:printer", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", + "@googletest//:gtest", ], ) @@ -361,10 +361,10 @@ cc_library( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", ], ) @@ -389,8 +389,8 @@ cc_binary( ":plugin_cc_proto", "//src/google/protobuf", "//src/google/protobuf/io:io_win32", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", ], ) @@ -409,12 +409,12 @@ cc_test( "//src/google/protobuf/io:tokenizer", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@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_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -463,12 +463,12 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:span", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -491,10 +491,10 @@ cc_library( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", ], ) @@ -510,12 +510,12 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -542,12 +542,12 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -560,9 +560,9 @@ cc_library( deps = [ "//src/google/protobuf", "//src/google/protobuf:port", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -575,11 +575,11 @@ cc_test( "//src/google/protobuf", "//src/google/protobuf/io", "//src/google/protobuf/io:tokenizer", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:die_if_null", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:die_if_null", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/cpp/BUILD.bazel b/src/google/protobuf/compiler/cpp/BUILD.bazel index 0c50d219b8f20..0a10a4654cbe2 100644 --- a/src/google/protobuf/compiler/cpp/BUILD.bazel +++ b/src/google/protobuf/compiler/cpp/BUILD.bazel @@ -18,7 +18,7 @@ cc_library( ":names_internal", "//src/google/protobuf", "//src/google/protobuf/compiler:code_generator", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -46,18 +46,18 @@ cc_library( "//src/google/protobuf/compiler:code_generator_lite", "//src/google/protobuf/io:printer", "//src/google/protobuf/io:tokenizer", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@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/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", ], ) @@ -118,23 +118,23 @@ cc_library( "//src/google/protobuf/compiler:versions", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/container:layout", - "@com_google_absl//absl/functional:any_invocable", - "@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/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:layout", + "@abseil-cpp//absl/functional:any_invocable", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:die_if_null", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", ], ) @@ -195,8 +195,8 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -223,11 +223,11 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -242,9 +242,9 @@ cc_test( "//src/google/protobuf:port", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -256,8 +256,8 @@ cc_test( "//:protobuf", "//src/google/protobuf", "//src/google/protobuf/compiler:command_line_interface_tester", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -270,9 +270,9 @@ cc_test( "//src/google/protobuf:cc_test_protos", "//src/google/protobuf:port", "//src/google/protobuf:protobuf_lite", - "@com_google_absl//absl/log:absl_check", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -288,9 +288,9 @@ cc_test( "//src/google/protobuf/compiler:command_line_interface", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -303,8 +303,8 @@ cc_test( "//src/google/protobuf:cc_test_protos", "//src/google/protobuf:test_util", "//src/google/protobuf/stubs:lite", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -318,8 +318,8 @@ cc_test( "//src/google/protobuf:cc_test_protos", "//src/google/protobuf:test_util", "//src/google/protobuf/stubs:lite", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -331,8 +331,8 @@ cc_test( "//:protobuf", "//src/google/protobuf:arena", "//src/google/protobuf:cc_test_protos", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -347,9 +347,9 @@ cc_test( "//src/google/protobuf/io:printer", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -361,11 +361,11 @@ cc_test( "//:protobuf", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings:string_view", + "@abseil-cpp//absl/types:optional", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -377,11 +377,11 @@ cc_test( "//:protobuf", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings:string_view", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings:string_view", + "@abseil-cpp//absl/types:optional", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/csharp/BUILD.bazel b/src/google/protobuf/compiler/csharp/BUILD.bazel index a0e45c699be1e..c140fc3882aef 100644 --- a/src/google/protobuf/compiler/csharp/BUILD.bazel +++ b/src/google/protobuf/compiler/csharp/BUILD.bazel @@ -16,7 +16,7 @@ cc_library( deps = [ "//src/google/protobuf", "//src/google/protobuf:port", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -78,10 +78,10 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/io:printer", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -105,10 +105,10 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -123,8 +123,8 @@ cc_test( "//src/google/protobuf/compiler:command_line_interface", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/java/BUILD.bazel b/src/google/protobuf/compiler/java/BUILD.bazel index b6a112e92523a..16c2128df4f28 100644 --- a/src/google/protobuf/compiler/java/BUILD.bazel +++ b/src/google/protobuf/compiler/java/BUILD.bazel @@ -56,12 +56,12 @@ cc_library( "//src/google/protobuf/compiler:versions", "//src/google/protobuf/io:printer", "//src/google/protobuf/io:tokenizer", - "@com_google_absl//absl/container:flat_hash_map", - "@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/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -83,9 +83,9 @@ cc_library( "//src/google/protobuf", "//src/google/protobuf:port", "//src/google/protobuf/compiler:code_generator", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -143,13 +143,13 @@ cc_library( "//src/google/protobuf/compiler/java/lite", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@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/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -171,12 +171,12 @@ cc_library( "//src/google/protobuf", "//src/google/protobuf:port", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:btree", - "@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/strings", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:string_view", ], ) @@ -190,8 +190,8 @@ cc_library( ":helpers", "//src/google/protobuf", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -204,8 +204,8 @@ cc_test( "//:protobuf", "//src/google/protobuf", "//src/google/protobuf/compiler:command_line_interface_tester", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -219,8 +219,8 @@ cc_test( ], deps = [ ":helpers", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -236,10 +236,10 @@ cc_test( "//src/google/protobuf/stubs:lite", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -259,11 +259,11 @@ cc_test( "//src/google/protobuf/stubs:lite", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/java/full/BUILD.bazel b/src/google/protobuf/compiler/java/full/BUILD.bazel index 8a437b1724362..bdc1cded928c4 100644 --- a/src/google/protobuf/compiler/java/full/BUILD.bazel +++ b/src/google/protobuf/compiler/java/full/BUILD.bazel @@ -43,11 +43,11 @@ cc_library( "//src/google/protobuf/compiler/java:helpers", "//src/google/protobuf/compiler/java:internal_helpers", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -80,8 +80,8 @@ cc_library( "//src/google/protobuf/compiler/java:generator_common", "//src/google/protobuf/compiler/java:helpers", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -98,8 +98,8 @@ cc_library( "//src/google/protobuf/compiler/java:helpers", "//src/google/protobuf/compiler/java:internal_helpers", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/strings", ], ) @@ -141,9 +141,9 @@ cc_library( "//src/google/protobuf/compiler/java:message_serialization", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", ], ) diff --git a/src/google/protobuf/compiler/java/lite/BUILD.bazel b/src/google/protobuf/compiler/java/lite/BUILD.bazel index e3c59cef23770..f7800133d422b 100644 --- a/src/google/protobuf/compiler/java/lite/BUILD.bazel +++ b/src/google/protobuf/compiler/java/lite/BUILD.bazel @@ -38,10 +38,10 @@ cc_library( "//src/google/protobuf/compiler/java:helpers", "//src/google/protobuf/compiler/java:internal_helpers", "//src/google/protobuf/io:printer", - "@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/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -81,9 +81,9 @@ cc_library( "//src/google/protobuf/compiler/java/full:service", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", ], ) diff --git a/src/google/protobuf/compiler/kotlin/BUILD.bazel b/src/google/protobuf/compiler/kotlin/BUILD.bazel index ff6aa6b1efae0..3ae6340a59d18 100644 --- a/src/google/protobuf/compiler/kotlin/BUILD.bazel +++ b/src/google/protobuf/compiler/kotlin/BUILD.bazel @@ -18,7 +18,7 @@ cc_library( "//src/google/protobuf/compiler/java", "//src/google/protobuf/compiler/java:helpers", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -54,9 +54,9 @@ cc_library( "//src/google/protobuf/compiler/java/lite:field_generators", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", ], ) diff --git a/src/google/protobuf/compiler/objectivec/BUILD.bazel b/src/google/protobuf/compiler/objectivec/BUILD.bazel index dbc714c84b888..b74a135a5623c 100644 --- a/src/google/protobuf/compiler/objectivec/BUILD.bazel +++ b/src/google/protobuf/compiler/objectivec/BUILD.bazel @@ -34,10 +34,10 @@ cc_library( "//src/google/protobuf", "//src/google/protobuf:port", "//src/google/protobuf/compiler:code_generator", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -53,7 +53,7 @@ cc_library( "//src/google/protobuf:port", "//src/google/protobuf/compiler:code_generator", "//src/google/protobuf/io", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -108,13 +108,13 @@ cc_library( "//src/google/protobuf/io:printer", "//src/google/protobuf/io:tokenizer", "//src/google/protobuf/stubs", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@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/memory", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", ], ) @@ -125,10 +125,10 @@ cc_test( ":line_consumer", "//src/google/protobuf/io", "//src/google/protobuf/stubs", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -138,8 +138,8 @@ cc_test( deps = [ ":names", "//src/google/protobuf/io", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -149,8 +149,8 @@ cc_test( deps = [ ":objectivec", "//src/google/protobuf:port", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/php/BUILD.bazel b/src/google/protobuf/compiler/php/BUILD.bazel index 7e21518f4c124..930db4476125b 100644 --- a/src/google/protobuf/compiler/php/BUILD.bazel +++ b/src/google/protobuf/compiler/php/BUILD.bazel @@ -17,7 +17,7 @@ cc_library( "//src/google/protobuf", "//src/google/protobuf:port", "//src/google/protobuf/compiler:code_generator", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -39,10 +39,10 @@ cc_library( "//src/google/protobuf/compiler:retention", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -53,8 +53,8 @@ cc_test( ":php", "//:protobuf", "//src/google/protobuf/compiler:command_line_interface_tester", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/python/BUILD.bazel b/src/google/protobuf/compiler/python/BUILD.bazel index bc38a94fc1633..81fa11bae0dd9 100644 --- a/src/google/protobuf/compiler/python/BUILD.bazel +++ b/src/google/protobuf/compiler/python/BUILD.bazel @@ -34,14 +34,14 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/io:printer", "//src/google/protobuf/io:tokenizer", - "@com_google_absl//absl/container:flat_hash_map", - "@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/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", ], ) @@ -56,10 +56,10 @@ cc_test( "//src/google/protobuf/io:printer", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/ruby/BUILD.bazel b/src/google/protobuf/compiler/ruby/BUILD.bazel index 4137ef0e87696..21091399c4948 100644 --- a/src/google/protobuf/compiler/ruby/BUILD.bazel +++ b/src/google/protobuf/compiler/ruby/BUILD.bazel @@ -23,9 +23,9 @@ cc_library( "//src/google/protobuf/compiler:retention", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -53,8 +53,8 @@ cc_test( "//src/google/protobuf/io:printer", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/compiler/rust/BUILD.bazel b/src/google/protobuf/compiler/rust/BUILD.bazel index aa43b19386046..d53c2605ae575 100644 --- a/src/google/protobuf/compiler/rust/BUILD.bazel +++ b/src/google/protobuf/compiler/rust/BUILD.bazel @@ -36,17 +36,17 @@ cc_library( "//src/google/protobuf/compiler/cpp:names", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_check", - "@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/types:optional", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", ], ) @@ -59,10 +59,10 @@ cc_library( deps = [ ":context", "//src/google/protobuf", - "@com_google_absl//absl/container:flat_hash_map", - "@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/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -74,12 +74,12 @@ cc_test( ":crate_mapping", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:string_view", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -99,10 +99,10 @@ cc_library( "//src/google/protobuf/compiler/cpp:names", "//src/google/protobuf/compiler/cpp:names_internal", "//src/google/protobuf/compiler/rust/accessors", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@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/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -119,14 +119,14 @@ cc_library( "//src/google/protobuf", "//src/google/protobuf/compiler:code_generator", "//src/google/protobuf/io:printer", - "@com_google_absl//absl/algorithm:container", - "@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", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/algorithm:container", + "@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", + "@abseil-cpp//absl/types:span", ], ) @@ -141,11 +141,11 @@ cc_library( ":naming", "//src/google/protobuf", "//src/google/protobuf/compiler/cpp:names", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/types:span", ], ) @@ -154,9 +154,9 @@ cc_test( srcs = ["enum_test.cc"], deps = [ ":enum", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -182,11 +182,11 @@ cc_library( "//src/google/protobuf:port", "//src/google/protobuf/compiler:code_generator", "//src/google/protobuf/compiler/cpp:names_internal", - "@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/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -205,9 +205,9 @@ cc_library( "//src/google/protobuf/compiler/cpp:names", "//src/google/protobuf/compiler/cpp:names_internal", "//src/google/protobuf/compiler/rust/accessors", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) @@ -218,9 +218,9 @@ cc_library( copts = COPTS, strip_include_prefix = "/src", deps = [ - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", ], ) @@ -229,8 +229,8 @@ cc_test( srcs = ["relative_path_test.cc"], deps = [ ":relative_path", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -246,7 +246,7 @@ cc_library( deps = [ "//src/google/protobuf", "//src/google/protobuf:port", - "@com_google_absl//absl/log:absl_log", + "@abseil-cpp//absl/log:absl_log", ], ) @@ -262,6 +262,6 @@ cc_library( deps = [ "//src/google/protobuf", "//upb_generator/minitable:names", - "@com_google_absl//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_check", ], ) diff --git a/src/google/protobuf/compiler/rust/accessors/BUILD.bazel b/src/google/protobuf/compiler/rust/accessors/BUILD.bazel index ccd7f7b94a1a5..71bd3ab285d66 100644 --- a/src/google/protobuf/compiler/rust/accessors/BUILD.bazel +++ b/src/google/protobuf/compiler/rust/accessors/BUILD.bazel @@ -42,9 +42,9 @@ cc_library( "//src/google/protobuf/compiler/rust:rust_field_type", "//src/google/protobuf/compiler/rust:upb_helpers", "//src/google/protobuf/io:tokenizer", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@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/strings", + "@abseil-cpp//absl/strings:str_format", ], ) diff --git a/src/google/protobuf/io/BUILD.bazel b/src/google/protobuf/io/BUILD.bazel index 5d4060413b3ec..3a5f724e5a213 100644 --- a/src/google/protobuf/io/BUILD.bazel +++ b/src/google/protobuf/io/BUILD.bazel @@ -30,15 +30,15 @@ cc_library( "//src/google/protobuf:endian", "//src/google/protobuf:port", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/base", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:internal", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:internal", + "@abseil-cpp//absl/types:span", ], ) @@ -51,8 +51,8 @@ cc_library( deps = [ ":io", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/types:optional", ], ) @@ -63,9 +63,9 @@ cc_test( deps = [ ":test_zero_copy_stream", "//src/google/protobuf/stubs", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/types:optional", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -89,10 +89,10 @@ cc_test( deps = [ ":zero_copy_sink", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -107,19 +107,19 @@ cc_library( ":zero_copy_sink", "//src/google/protobuf:port", "//src/google/protobuf/stubs", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/cleanup", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/functional:any_invocable", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/meta:type_traits", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/functional:any_invocable", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/meta:type_traits", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", ], ) @@ -139,10 +139,10 @@ cc_library( ":io", "//src/google/protobuf:port", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@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/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -159,8 +159,8 @@ cc_library( ":io", "//src/google/protobuf:port", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", ] + select({ "//build_defs:config_msvc": [], "//conditions:default": ["@zlib"], @@ -182,7 +182,7 @@ cc_library( deps = [ "//src/google/protobuf:arena", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -213,21 +213,21 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/base", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:log_severity", - "@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/log:scoped_mock_log", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:log_severity", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:scoped_mock_log", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/types:optional", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -240,8 +240,8 @@ cc_test( ], deps = [ "//:protobuf_lite", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/json/BUILD.bazel b/src/google/protobuf/json/BUILD.bazel index 8c6f5e712285d..96b459baaf4bc 100644 --- a/src/google/protobuf/json/BUILD.bazel +++ b/src/google/protobuf/json/BUILD.bazel @@ -26,11 +26,11 @@ cc_library( "//src/google/protobuf/io:zero_copy_sink", "//src/google/protobuf/stubs", "//src/google/protobuf/util:type_resolver", - "@com_google_absl//absl/base", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", ], ) @@ -54,12 +54,12 @@ cc_test( "//src/google/protobuf/util:json_format_cc_proto", "//src/google/protobuf/util:json_format_proto3_cc_proto", "//src/google/protobuf/util:type_resolver", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -73,13 +73,13 @@ cc_library( "//src/google/protobuf:port", "//src/google/protobuf/io", "//src/google/protobuf/stubs", - "@com_google_absl//absl/algorithm:container", - "@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", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/algorithm:container", + "@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", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -91,9 +91,9 @@ cc_test( ":zero_copy_buffered_stream", "//src/google/protobuf/io:test_zero_copy_stream", "//src/google/protobuf/stubs", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -112,15 +112,15 @@ cc_library( "//src/google/protobuf/stubs", "//src/google/protobuf/util:type_resolver", "//third_party/utf8_range:utf8_validity", - "@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/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@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/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", ], ) @@ -138,13 +138,13 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/stubs", "//third_party/utf8_range:utf8_validity", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/numeric:bits", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -159,14 +159,14 @@ cc_test( "//src/google/protobuf/io", "//src/google/protobuf/io:test_zero_copy_stream", "//src/google/protobuf/stubs", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:variant", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:variant", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -182,10 +182,10 @@ cc_library( "//src/google/protobuf/io:tokenizer", "//src/google/protobuf/io:zero_copy_sink", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -200,12 +200,12 @@ cc_library( "//src/google/protobuf", "//src/google/protobuf:port", "//src/google/protobuf/util:type_resolver", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:optional", ], ) @@ -232,18 +232,18 @@ cc_library( "//src/google/protobuf/io:zero_copy_sink", "//src/google/protobuf/stubs", "//src/google/protobuf/util:type_resolver", - "@com_google_absl//absl/base", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@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/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/container:flat_hash_map", + "@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/status:statusor", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", ], ) @@ -269,15 +269,15 @@ cc_library( "//src/google/protobuf/io:zero_copy_sink", "//src/google/protobuf/stubs", "//src/google/protobuf/util:type_resolver", - "@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", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", + "@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", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:variant", ], ) @@ -290,7 +290,7 @@ cc_library( deps = [ "//src/google/protobuf", "//src/google/protobuf:port", - "@com_google_absl//absl/cleanup", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/strings", ], ) diff --git a/src/google/protobuf/stubs/BUILD.bazel b/src/google/protobuf/stubs/BUILD.bazel index 11958740f6e56..95bc0152ad71f 100644 --- a/src/google/protobuf/stubs/BUILD.bazel +++ b/src/google/protobuf/stubs/BUILD.bazel @@ -32,10 +32,10 @@ cc_library( strip_include_prefix = "/src", deps = [ "//src/google/protobuf:port", - "@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_log", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -57,9 +57,9 @@ cc_library( deps = [ ":lite", "//src/google/protobuf:port", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -80,10 +80,10 @@ cc_test( ":stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/src/google/protobuf/testing/BUILD.bazel b/src/google/protobuf/testing/BUILD.bazel index 71bf03a3c11c5..29324d9a25746 100644 --- a/src/google/protobuf/testing/BUILD.bazel +++ b/src/google/protobuf/testing/BUILD.bazel @@ -21,10 +21,10 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/io:io_win32", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", ], ) @@ -47,14 +47,14 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/io:io_win32", "//src/google/protobuf/stubs:lite", - "@com_google_absl//absl/base:log_severity", - "@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/log:log_sink", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", + "@abseil-cpp//absl/base:log_severity", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:log_sink", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", ], ) diff --git a/src/google/protobuf/util/BUILD.bazel b/src/google/protobuf/util/BUILD.bazel index 89bea6c58b91a..f6c16b6ce63e4 100644 --- a/src/google/protobuf/util/BUILD.bazel +++ b/src/google/protobuf/util/BUILD.bazel @@ -32,8 +32,8 @@ cc_test( "//src/google/protobuf:test_util", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -55,14 +55,14 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/io:printer", "//src/google/protobuf/stubs", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:fixed_array", - "@com_google_absl//absl/container:flat_hash_map", - "@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/strings", - "@com_google_absl//absl/strings:str_format", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/container:fixed_array", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", ], ) @@ -76,8 +76,8 @@ cc_test( "//src/google/protobuf:cc_test_protos", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -101,12 +101,12 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/functional:bind_front", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/functional:bind_front", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -122,12 +122,12 @@ cc_library( "//src/google/protobuf:field_mask_cc_proto", "//src/google/protobuf:port", "//src/google/protobuf/stubs", - "@com_google_absl//absl/container:btree", - "@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/memory", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/log:die_if_null", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", ], ) @@ -144,8 +144,8 @@ cc_test( "//src/google/protobuf/stubs", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -173,11 +173,11 @@ cc_library( "//src/google/protobuf:port", "//src/google/protobuf:timestamp_cc_proto", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/numeric:int128", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/numeric:int128", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/time", ], ) @@ -191,8 +191,8 @@ cc_test( "//src/google/protobuf:timestamp_cc_proto", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -217,9 +217,9 @@ cc_library( "//src/google/protobuf/io", "//src/google/protobuf/io:tokenizer", "//src/google/protobuf/stubs", - "@com_google_absl//absl/log:absl_log", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", ], ) @@ -242,10 +242,10 @@ cc_test( "//src/google/protobuf:wrappers_cc_proto", "//src/google/protobuf/testing", "//src/google/protobuf/testing:file", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/third_party/utf8_range/BUILD.bazel b/third_party/utf8_range/BUILD.bazel index 47682a2ba97b8..5ed28a11a4a82 100644 --- a/third_party/utf8_range/BUILD.bazel +++ b/third_party/utf8_range/BUILD.bazel @@ -61,7 +61,7 @@ cc_library( strip_include_prefix = "/third_party/utf8_range", deps = [ ":utf8_range", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -74,8 +74,8 @@ cc_test( deps = [ ":utf8_range", ":utf8_validity", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/toolchain/toolchains.bazelrc b/toolchain/toolchains.bazelrc index d0858f48f232a..54bb23e0f7e5e 100644 --- a/toolchain/toolchains.bazelrc +++ b/toolchain/toolchains.bazelrc @@ -3,8 +3,9 @@ build:cross_config --//toolchain:release=true build:cross_config --host_crosstool_top=@bazel_tools//tools/cpp:toolchain build:cross_config --incompatible_enable_cc_toolchain_resolution=false -build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64 -build:linux-aarch64 --config=cross_config --cpu=linux-aarch_64 +# Set platform explicitly for aarch64 emulation images. +build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64 --platforms=//build_defs:aarch64_linux +build:linux-aarch64 --config=cross_config --cpu=linux-aarch_64 --platforms=//build_defs:aarch64_linux build:linux-ppcle_64 --config=cross_config --cpu=linux-ppcle_64 build:linux-ppc64le --config=cross_config --cpu=linux-ppcle_64 build:linux-s390_64 --config=cross_config --cpu=linux-s390_64 diff --git a/upb/base/BUILD b/upb/base/BUILD index a2848eb7c4d41..198131a6a5fbb 100644 --- a/upb/base/BUILD +++ b/upb/base/BUILD @@ -44,8 +44,8 @@ cc_test( srcs = ["string_view_test.cc"], deps = [ ":base", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/hash/BUILD b/upb/hash/BUILD index b7313d3979bff..39ae661516a34 100644 --- a/upb/hash/BUILD +++ b/upb/hash/BUILD @@ -36,9 +36,9 @@ cc_test( ":hash", "//upb:mem", "//upb:port", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_map", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/io/BUILD b/upb/io/BUILD index 700eb046d01fe..d0f6c9afcfe24 100644 --- a/upb/io/BUILD +++ b/upb/io/BUILD @@ -63,8 +63,8 @@ cc_test( deps = [ ":string", "//upb:mem", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -80,10 +80,10 @@ cc_test( "//upb:mem", "//upb:port", "//upb/lex", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -98,7 +98,7 @@ cc_test( ":zero_copy_stream", "//upb:base", "//upb:mem", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/json/BUILD b/upb/json/BUILD index e4bd9e44bb1e9..8184f8a2f30aa 100644 --- a/upb/json/BUILD +++ b/upb/json/BUILD @@ -45,8 +45,8 @@ cc_test( "//upb:base", "//upb:mem", "//upb:reflection", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -61,8 +61,8 @@ cc_test( "//upb:base", "//upb:mem", "//upb:reflection", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/lex/BUILD b/upb/lex/BUILD index 91c4d11a65dc5..0ae91b27c602e 100644 --- a/upb/lex/BUILD +++ b/upb/lex/BUILD @@ -33,9 +33,9 @@ cc_test( srcs = ["atoi_test.cc"], deps = [ ":lex", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -44,8 +44,8 @@ cc_test( srcs = ["round_trip_test.cc"], deps = [ ":lex", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/mem/BUILD b/upb/mem/BUILD index 6eebe641b01e4..30941c0e337d8 100644 --- a/upb/mem/BUILD +++ b/upb/mem/BUILD @@ -46,15 +46,15 @@ cc_test( deps = [ ":mem", "//upb:port", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/cleanup", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/random", - "@com_google_absl//absl/random:distributions", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/random", + "@abseil-cpp//absl/random:distributions", + "@abseil-cpp//absl/synchronization", + "@abseil-cpp//absl/time", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/message/BUILD b/upb/message/BUILD index 0d5f468ebf3f0..e715238454b56 100644 --- a/upb/message/BUILD +++ b/upb/message/BUILD @@ -191,8 +191,8 @@ cc_test( "//upb/test:test_messages_proto2_upb_minitable", "//upb/test:test_messages_proto2_upb_proto", "//upb/test:test_upb_proto", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -267,9 +267,9 @@ cc_test( "//upb/test:test_messages_proto3_upb_minitable", "//upb/test:test_messages_proto3_upb_proto", "//upb/test:test_upb_proto", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_set", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -280,8 +280,8 @@ cc_test( ":message", "//upb:base", "//upb:mem", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -299,9 +299,9 @@ cc_test( "//upb:wire_reader", "//upb/base:internal", "//upb/test:test_messages_proto2_upb_proto", - "@com_google_absl//absl/types:variant", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/types:variant", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -321,9 +321,9 @@ cc_test( "//upb/test:test_messages_proto2_upb_minitable", "//upb/test:test_messages_proto2_upb_proto", "//upb/test:test_upb_proto", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_set", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -334,8 +334,8 @@ cc_test( ":message", "//upb:base", "//upb:mem", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -358,9 +358,9 @@ cc_test( "//upb/test:test_messages_proto3_upb_proto", "//upb/test:test_proto_upb_minitable", "//upb/test:test_upb_proto", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_set", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -387,9 +387,9 @@ cc_test( "//upb/test:fuzz_util", "//upb/test:test_messages_proto3_upb_proto", "//upb/text:debug", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -440,8 +440,8 @@ cc_test( "//upb:base", "//upb:mem", "//upb:wire", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/mini_descriptor/BUILD b/upb/mini_descriptor/BUILD index a41c1017fc8ea..6dee2803ecbf7 100644 --- a/upb/mini_descriptor/BUILD +++ b/upb/mini_descriptor/BUILD @@ -70,9 +70,9 @@ cc_test( "//upb:port", "//upb:wire", "//upb/message:internal", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/container:flat_hash_set", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/mini_table/BUILD b/upb/mini_table/BUILD index d62d5d7367039..91bd31736a87b 100644 --- a/upb/mini_table/BUILD +++ b/upb/mini_table/BUILD @@ -95,8 +95,8 @@ cc_test( "//upb/test:test_messages_proto2_upb_minitable", "//upb/test:test_messages_proto3_upb_minitable", "//upb/test:test_upb_proto", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -120,10 +120,10 @@ cc_test( ":mini_table", "//upb:mini_table_compat", "//upb:port", + "@abseil-cpp//absl/random", "@com_github_google_benchmark//:benchmark_main", - "@com_google_absl//absl/random", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/reflection/BUILD b/upb/reflection/BUILD index 40fd8e54f1603..a052b8ac9216b 100644 --- a/upb/reflection/BUILD +++ b/upb/reflection/BUILD @@ -181,9 +181,9 @@ cc_test( "//upb:port", "//upb:reflection", "//upb/hash", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/test/BUILD b/upb/test/BUILD index 63794cc25b8be..8b128112e6971 100644 --- a/upb/test/BUILD +++ b/upb/test/BUILD @@ -29,7 +29,7 @@ cc_library( visibility = ["//upb:__subpackages__"], deps = [ "//src/google/protobuf", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -180,8 +180,8 @@ cc_test( ":proto3_test_upb_proto", ":proto3_test_upb_proto_reflection", "//upb:reflection", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -195,8 +195,8 @@ cc_test( "//upb:base", "//upb:mem", "//upb:reflection", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -214,8 +214,8 @@ cc_test( "//upb:mini_table", "//upb:wire", "//upb/mem:internal", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -232,8 +232,8 @@ cc_test( "//upb:json", "//upb:port", "//upb:reflection", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -251,8 +251,8 @@ cc_test( "//upb:mem", "//upb:message", "//upb:port", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -267,8 +267,8 @@ cc_test( ":test_messages_proto2_upb_minitable", ":test_upb_proto", "//upb:mini_table", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -320,8 +320,8 @@ cc_test( srcs = ["test_import_empty_srcs.cc"], deps = [ ":test_import_empty_srcs_upb_minitable_proto", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/text/BUILD b/upb/text/BUILD index 055621e296ece..80e51e41ce804 100644 --- a/upb/text/BUILD +++ b/upb/text/BUILD @@ -98,9 +98,9 @@ cc_test( "//upb/message:internal", "//upb/test:test_proto_upb_minitable", "//upb/test:test_upb_proto", - "@com_google_absl//absl/log:absl_log", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/log:absl_log", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/util/BUILD b/upb/util/BUILD index 768859ed87e79..a949cd5421098 100644 --- a/upb/util/BUILD +++ b/upb/util/BUILD @@ -56,7 +56,7 @@ cc_library( "//upb:base", "//upb:mem", "//upb/reflection:internal", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -78,9 +78,9 @@ cc_test( "//upb:mem", "//upb:reflection", "//upb/test:parse_text_proto", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -145,9 +145,9 @@ cc_test( "//upb:mem", "//upb:reflection", "//upb/reflection:internal", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb/wire/BUILD b/upb/wire/BUILD index 7613e266c8b52..ae0739882cdd8 100644 --- a/upb/wire/BUILD +++ b/upb/wire/BUILD @@ -86,8 +86,8 @@ cc_test( "//upb:mini_table", "//upb/test:test_messages_proto2_upb_minitable", "//upb/test:test_messages_proto2_upb_proto", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) @@ -108,8 +108,8 @@ cc_test( deps = [ ":eps_copy_input_stream", "//upb:mem", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/upb_generator/BUILD b/upb_generator/BUILD index f27369977ff90..d979f1eafd0b9 100644 --- a/upb_generator/BUILD +++ b/upb_generator/BUILD @@ -55,7 +55,7 @@ bootstrap_cc_library( "//src/google/protobuf:port", "//upb:mini_table", "//upb:port", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -79,8 +79,8 @@ bootstrap_cc_library( "//upb:mini_descriptor", "//upb:mini_table", "//upb:port", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/strings", ], ) @@ -106,11 +106,11 @@ bootstrap_cc_library( "//upb:base", "//upb:mem", "//upb:port", - "@com_google_absl//absl/container:flat_hash_map", - "@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/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/strings", ], ) diff --git a/upb_generator/c/BUILD b/upb_generator/c/BUILD index 2c169e560d75a..fcbac23d2b654 100644 --- a/upb_generator/c/BUILD +++ b/upb_generator/c/BUILD @@ -27,8 +27,8 @@ cc_library( visibility = ["//src/google/protobuf/compiler/hpb:__pkg__"], deps = [ ":names_internal", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/strings", ], ) @@ -38,7 +38,7 @@ cc_library( hdrs = ["names_internal.h"], deps = [ "//upb_generator/common:names", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -80,14 +80,14 @@ bootstrap_cc_library( "//upb_generator/common:names", "//upb_generator/minitable:names", "//upb_generator/minitable:names_internal", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/container:flat_hash_map", - "@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/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", ], ) diff --git a/upb_generator/common/BUILD b/upb_generator/common/BUILD index 8980b24e15863..78bf1727d5329 100644 --- a/upb_generator/common/BUILD +++ b/upb_generator/common/BUILD @@ -16,8 +16,8 @@ cc_library( hdrs = ["names.h"], visibility = ["//upb_generator:__subpackages__"], deps = [ - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:string_view", ], ) @@ -36,7 +36,7 @@ cc_library( "//upb:mem", "//upb:mini_table", "//upb:reflection", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_check", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", ], ) diff --git a/upb_generator/minitable/BUILD b/upb_generator/minitable/BUILD index 9988948f9e586..e34ea293cffdb 100644 --- a/upb_generator/minitable/BUILD +++ b/upb_generator/minitable/BUILD @@ -44,13 +44,13 @@ bootstrap_cc_library( "//upb:wire_reader", "//upb/mini_table:internal", "//upb_generator/common:names", - "@com_google_absl//absl/container:flat_hash_map", - "@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/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", ], ) @@ -67,7 +67,7 @@ cc_library( deps = [ ":names_internal", "//upb:port", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -81,7 +81,7 @@ cc_library( ], deps = [ "//upb_generator/common:names", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -123,12 +123,12 @@ bootstrap_cc_library( "//upb:mem", "//upb:port", "//upb_generator/common:names", - "@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/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/log:absl_log", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", ], ) diff --git a/upb_generator/reflection/BUILD b/upb_generator/reflection/BUILD index f41db6c94020c..fd74f1c904fb5 100644 --- a/upb_generator/reflection/BUILD +++ b/upb_generator/reflection/BUILD @@ -19,7 +19,7 @@ cc_library( deps = [ "//upb:port", "//upb_generator/common:names", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", ], ) @@ -55,12 +55,12 @@ cc_library( "//upb_generator:plugin", "//upb_generator/common:names", "//upb_generator/minitable:names", - "@com_google_absl//absl/container:flat_hash_set", - "@com_google_absl//absl/log:absl_check", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:string_view", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/log:absl_check", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:string_view", ], ) From 5656b318e1a5562711162dd6733faae2e398debc Mon Sep 17 00:00:00 2001 From: Sandy Zhang Date: Mon, 10 Feb 2025 13:31:37 -0500 Subject: [PATCH 2/2] Update staleness --- cmake/dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index eb3a9b4acb70b..1b5847a6c4953 100644 --- 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")