From ec43200ad526467d1558e40e287c844f086a26a7 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Fri, 14 Jun 2024 13:19:45 -0700 Subject: [PATCH] feat: first attempt bzlmod support --- .bazelignore | 2 + .bazelrc | 5 +- .bazelversion | 2 +- .gitignore | 1 + MODULE.bazel | 30 ++++++++ WORKSPACE.bzlmod | 0 bazel/crc32c.BUILD | 4 +- docfx/BUILD.bazel | 2 +- examples/BUILD.bazel | 2 +- generator/BUILD.bazel | 32 ++++----- generator/integration_tests/BUILD.bazel | 40 +++++------ google/cloud/BUILD.bazel | 72 +++++++++---------- google/cloud/accessapproval/BUILD.bazel | 2 +- google/cloud/accesscontextmanager/BUILD.bazel | 2 +- .../cloud/advisorynotifications/BUILD.bazel | 2 +- google/cloud/aiplatform/BUILD.bazel | 2 +- google/cloud/alloydb/BUILD.bazel | 2 +- google/cloud/apigateway/BUILD.bazel | 2 +- google/cloud/apigeeconnect/BUILD.bazel | 2 +- google/cloud/apikeys/BUILD.bazel | 2 +- google/cloud/appengine/BUILD.bazel | 6 +- google/cloud/apphub/BUILD.bazel | 2 +- google/cloud/artifactregistry/BUILD.bazel | 2 +- google/cloud/asset/BUILD.bazel | 2 +- google/cloud/assuredworkloads/BUILD.bazel | 2 +- google/cloud/automl/BUILD.bazel | 2 +- google/cloud/backupdr/BUILD.bazel | 2 +- google/cloud/baremetalsolution/BUILD.bazel | 2 +- google/cloud/batch/BUILD.bazel | 2 +- google/cloud/bigquery/BUILD.bazel | 6 +- .../v2/minimal/benchmarks/BUILD.bazel | 6 +- google/cloud/bigtable/BUILD.bazel | 20 +++--- google/cloud/bigtable/benchmarks/BUILD.bazel | 2 +- google/cloud/bigtable/examples/BUILD.bazel | 8 +-- google/cloud/bigtable/test_proxy/BUILD.bazel | 8 +-- google/cloud/bigtable/tests/BUILD.bazel | 2 +- google/cloud/billing/BUILD.bazel | 4 +- google/cloud/binaryauthorization/BUILD.bazel | 2 +- google/cloud/cloudquotas/BUILD.bazel | 2 +- google/cloud/commerce/BUILD.bazel | 2 +- google/cloud/compute/compute_library.bzl | 2 +- .../cloud/contactcenterinsights/BUILD.bazel | 2 +- google/cloud/container/BUILD.bazel | 2 +- google/cloud/containeranalysis/BUILD.bazel | 4 +- google/cloud/contentwarehouse/BUILD.bazel | 2 +- google/cloud/documentai/BUILD.bazel | 2 +- google/cloud/domains/BUILD.bazel | 2 +- google/cloud/filestore/BUILD.bazel | 2 +- google/cloud/functions/BUILD.bazel | 4 +- google/cloud/gkebackup/BUILD.bazel | 2 +- .../logging/integration_tests/BUILD.bazel | 2 +- google/cloud/oauth2/BUILD.bazel | 2 +- google/cloud/opentelemetry/BUILD.bazel | 4 +- .../integration_tests/BUILD.bazel | 2 +- google/cloud/pubsub/BUILD.bazel | 12 ++-- .../pubsub/integration_tests/BUILD.bazel | 2 +- google/cloud/pubsub/samples/BUILD.bazel | 4 +- google/cloud/pubsublite/BUILD.bazel | 6 +- .../pubsublite/integration_tests/BUILD.bazel | 2 +- google/cloud/spanner/BUILD.bazel | 28 ++++---- .../admin/integration_tests/BUILD.bazel | 4 +- google/cloud/spanner/benchmarks/BUILD.bazel | 2 +- .../spanner/integration_tests/BUILD.bazel | 2 +- google/cloud/spanner/samples/BUILD.bazel | 2 +- google/cloud/sql/BUILD.bazel | 4 +- google/cloud/storage/BUILD.bazel | 56 +++++++-------- google/cloud/storage/benchmarks/BUILD.bazel | 14 ++-- google/cloud/storage/examples/BUILD.bazel | 4 +- google/cloud/storage/tests/BUILD.bazel | 4 +- google/cloud/testing_util/BUILD.bazel | 30 ++++---- google/cloud/vmwareengine/BUILD.bazel | 2 +- google/cloud/vpcaccess/BUILD.bazel | 2 +- google/cloud/webrisk/BUILD.bazel | 2 +- google/cloud/websecurityscanner/BUILD.bazel | 2 +- google/cloud/workflows/BUILD.bazel | 4 +- google/cloud/workstations/BUILD.bazel | 2 +- protos/google/cloud/compute/BUILD.bazel | 18 ++--- 77 files changed, 282 insertions(+), 252 deletions(-) create mode 100644 MODULE.bazel create mode 100644 WORKSPACE.bzlmod diff --git a/.bazelignore b/.bazelignore index 98112232070b2..28f9eab47d3bf 100644 --- a/.bazelignore +++ b/.bazelignore @@ -5,3 +5,5 @@ cmake-build-debug/ cmake-build-coverage/ cmake-build-release/ .build/ +external/ +examples/ diff --git a/.bazelrc b/.bazelrc index 474cebb0c3c7f..8bdd6cfb8f97f 100644 --- a/.bazelrc +++ b/.bazelrc @@ -39,9 +39,6 @@ build --experimental_convenience_symlinks=ignore # frustrating when they fail and don't give any output. So, remove the limit. build --experimental_ui_max_stdouterr_bytes=-1 -# TODO(#11485) - enable bzlmod once it works -common --noenable_bzlmod - # TODO(#13311) - remove once gRPC works with Bazel v7 or when gRPC stops using # `apple_rules`. common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1 @@ -52,7 +49,7 @@ common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1 test --test_env=GTEST_SHUFFLE --test_env=GTEST_RANDOM_SEED # By default, build the library with OpenTelemetry -build --@io_opentelemetry_cpp//api:with_abseil +build --@opentelemetry-cpp//api:with_abseil build --//:enable_opentelemetry # Don't show warnings when building external dependencies. This still shows diff --git a/.bazelversion b/.bazelversion index f22d756da39d4..0ee843cc60466 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.5.0 +7.2.0 diff --git a/.gitignore b/.gitignore index e4ab153f432d6..53d8c1dd34d3e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ cmake-out/ /bazel-* /google/cloud/*/quickstart/bazel-* !bazel-*.cfg +*.bazel.lock # Used by some IDEs and LSP plugins compile_commands.json diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 0000000000000..003e3ccb40bb7 --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,30 @@ +module( + name = "google-cloud-cpp", + version = "2.25.0", +) + +bazel_dep(name = "rules_cc", version = "0.0.9") +bazel_dep(name = "platforms", version = "0.0.10") +bazel_dep(name = "abseil-cpp", version = "20240116.2") +bazel_dep(name = "curl", version = "8.7.1") +bazel_dep(name = "libpfm", version = "4.11.0") +bazel_dep(name = "opentelemetry-cpp", version = "1.14.2") +bazel_dep(name = "crc32c", version = "1.1.0") +bazel_dep(name = "grpc", version = "1.63.1") +bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3") +bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5") +bazel_dep(name = "protobuf", version = "27.1.bcr.1") +bazel_dep(name = "googletest", version = "1.14.0.bcr.1") +bazel_dep(name = "rules_apple", version = "3.5.1") +bazel_dep(name = "apple_support", version = "1.15.1") +bazel_dep(name = "nlohmann_json", version = "3.11.3") +bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "rules_proto", version = "6.0.0.bcr.1") +bazel_dep(name = "google_benchmark", version = "1.8.4") + +switched_rules = use_extension("@googleapis//:extensions.bzl", "switched_rules") +switched_rules.use_languages( + cc = True, + grpc = True, +) +use_repo(switched_rules, "com_google_googleapis_imports") diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/bazel/crc32c.BUILD b/bazel/crc32c.BUILD index c8d8b3c2134d7..4242fbde5001b 100644 --- a/bazel/crc32c.BUILD +++ b/bazel/crc32c.BUILD @@ -146,8 +146,8 @@ cc_test( srcs = crc32c_test_sources, deps = [ ":crc32c", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) diff --git a/docfx/BUILD.bazel b/docfx/BUILD.bazel index dcb5eef07f0fc..93b5d8c544b52 100644 --- a/docfx/BUILD.bazel +++ b/docfx/BUILD.bazel @@ -63,7 +63,7 @@ cc_library( ":docfx", ":docfx_testing", "@com_github_zeux_pugixml//:pugixml", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in unit_tests] diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index bd8a2cce6fdad..679025d2613c5 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -95,6 +95,6 @@ cc_test( "//:spanner", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", + "@curl", ], ) diff --git a/generator/BUILD.bazel b/generator/BUILD.bazel index aaecc064eab95..7fe9071b1a49f 100644 --- a/generator/BUILD.bazel +++ b/generator/BUILD.bazel @@ -34,16 +34,16 @@ cc_library( "//:common", "//google/cloud:google_cloud_cpp_rest_internal", "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_github_nlohmann_json//:nlohmann_json", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_googleapis//:googleapis_system_includes", - "@com_google_googleapis//google/api:client_cc_proto", - "@com_google_googleapis//google/api:field_info_cc_proto", - "@com_google_googleapis//google/api:routing_cc_proto", - "@com_google_googleapis//google/cloud:extended_operations_cc_proto", - "@com_google_googleapis//google/longrunning:longrunning_cc_proto", - "@com_google_protobuf//:protoc_lib", + "@nlohmann_json//:nlohmann_json", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@googleapis//:googleapis_system_includes", + "@googleapis//google/api:client_cc_proto", + "@googleapis//google/api:field_info_cc_proto", + "@googleapis//google/api:routing_cc_proto", + "@googleapis//google/cloud:extended_operations_cc_proto", + "@googleapis//google/longrunning:longrunning_cc_proto", + "@protobuf//:protoc_lib", ], ) @@ -61,8 +61,8 @@ cc_library( ":google_cloud_cpp_generator", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/longrunning:longrunning_cc_proto", - "@com_google_googletest//:gtest", + "@googleapis//google/longrunning:longrunning_cc_proto", + "@googletest//:gtest", ], ) @@ -77,7 +77,7 @@ cc_library( deps = [ ":google_cloud_cpp_generator", ":google_cloud_cpp_generator_testing", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) for test in google_cloud_cpp_generator_unit_tests] @@ -115,8 +115,8 @@ cc_binary( deps = [ ":generator_config_cc_proto", ":google_cloud_cpp_generator", - "@com_google_absl//absl/flags:commandlineflag", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/flags:parse", + "@abseil-cpp//absl/flags:commandlineflag", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/flags:parse", ], ) diff --git a/generator/integration_tests/BUILD.bazel b/generator/integration_tests/BUILD.bazel index f512a6f02a57d..5ced091b94e66 100644 --- a/generator/integration_tests/BUILD.bazel +++ b/generator/integration_tests/BUILD.bazel @@ -33,22 +33,22 @@ proto_library( "test_request_id.proto", ], deps = [ - "@com_google_googleapis//google/api:annotations_proto", - "@com_google_googleapis//google/api:client_proto", - "@com_google_googleapis//google/api:field_behavior_proto", - "@com_google_googleapis//google/api:field_info_proto", - "@com_google_googleapis//google/api:resource_proto", - "@com_google_googleapis//google/api:routing_proto", - "@com_google_googleapis//google/iam/v1:iam_policy_proto", - "@com_google_googleapis//google/iam/v1:policy_proto", - "@com_google_googleapis//google/longrunning:operations_proto", - "@com_google_googleapis//google/rpc:status_proto", - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:struct_proto", - "@com_google_protobuf//:timestamp_proto", + "@googleapis//google/api:annotations_proto", + "@googleapis//google/api:client_proto", + "@googleapis//google/api:field_behavior_proto", + "@googleapis//google/api:field_info_proto", + "@googleapis//google/api:resource_proto", + "@googleapis//google/api:routing_proto", + "@googleapis//google/iam/v1:iam_policy_proto", + "@googleapis//google/iam/v1:policy_proto", + "@googleapis//google/longrunning:operations_proto", + "@googleapis//google/rpc:status_proto", + "@protobuf//:any_proto", + "@protobuf//:duration_proto", + "@protobuf//:empty_proto", + "@protobuf//:field_mask_proto", + "@protobuf//:struct_proto", + "@protobuf//:timestamp_proto", ], ) @@ -105,8 +105,8 @@ cc_library( "//:grpc_utils", "//google/cloud:google_cloud_cpp_rest_internal", "//google/cloud:google_cloud_cpp_rest_protobuf_internal", - "@com_google_absl//absl/strings", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", + "@abseil-cpp//absl/strings", + "@googleapis//google/longrunning:longrunning_cc_grpc", ], ) @@ -131,7 +131,7 @@ filegroup( "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in glob(["tests/*.cc"])] @@ -157,6 +157,6 @@ filegroup( tags = ["benchmark"], deps = [ ":google_cloud_cpp_generator_golden", - "@com_google_benchmark//:benchmark_main", + "@google_benchmark//:benchmark_main", ], ) for benchmark in glob(["benchmarks/*.cc"])] diff --git a/google/cloud/BUILD.bazel b/google/cloud/BUILD.bazel index 33cb29a85ee6a..4a0fabe75f020 100644 --- a/google/cloud/BUILD.bazel +++ b/google/cloud/BUILD.bazel @@ -48,7 +48,7 @@ config_setting( name = "enable_opentelemetry_valid", flag_values = { "//:enable_opentelemetry": "true", - "@io_opentelemetry_cpp//api:with_abseil": "true", + "@opentelemetry-cpp//api:with_abseil": "true", }, ) @@ -112,17 +112,17 @@ to your build command, or set this value in your `.bazelrc` file(s). "//:__pkg__", ], deps = [ - "@com_google_absl//absl/base", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@abseil-cpp//absl/base", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:optional", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", ] + select({ ":enable_opentelemetry_valid": [ - "@io_opentelemetry_cpp//api", + "@opentelemetry-cpp//api", ], "//conditions:default": [], }) + select({ @@ -156,7 +156,7 @@ cc_library( ":google_cloud_cpp_common", ":google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_common_unit_tests] @@ -191,14 +191,14 @@ cc_library( ], deps = [ ":google_cloud_cpp_common", - "@com_github_grpc_grpc//:grpc++", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/time", - "@com_google_googleapis//:googleapis_system_includes", - "@com_google_googleapis//google/iam/credentials/v1:credentials_cc_grpc", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", - "@com_google_googleapis//google/rpc:error_details_cc_proto", - "@com_google_googleapis//google/rpc:status_cc_proto", + "@grpc//:grpc++", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/time", + "@googleapis//:googleapis_system_includes", + "@googleapis//google/iam/credentials/v1:credentials_cc_grpc", + "@googleapis//google/longrunning:longrunning_cc_grpc", + "@googleapis//google/rpc:error_details_cc_proto", + "@googleapis//google/rpc:status_cc_proto", ], ) @@ -223,9 +223,9 @@ cc_library( ":google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", - "@com_google_googletest//:gtest_main", + "@googletest//google/bigtable/admin/v2:admin_cc_grpc", + "@googletest//google/bigtable/v2:bigtable_cc_grpc", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_grpc_utils_unit_tests] @@ -240,9 +240,9 @@ cc_library( ":google_cloud_cpp_grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", - "@com_google_googletest//:gtest_main", + "@googletest//google/bigtable/admin/v2:admin_cc_grpc", + "@googletest//google/bigtable/v2:bigtable_cc_grpc", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_grpc_utils_integration_tests] @@ -299,10 +299,10 @@ cc_library( visibility = ["//:__subpackages__"], deps = [ ":google_cloud_cpp_common", - "@com_github_curl_curl//:curl", - "@com_github_nlohmann_json//:nlohmann_json", - "@com_google_absl//absl/functional:function_ref", - "@com_google_absl//absl/types:span", + "@curl", + "@nlohmann_json//:json", + "@abseil-cpp//absl/functional:function_ref", + "@abseil-cpp//absl/types:span", ] + select({ "@platforms//os:windows": [], "//conditions:default": [ @@ -319,7 +319,7 @@ cc_library( ":google_cloud_cpp_rest_internal", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_internal_unit_tests] @@ -332,7 +332,7 @@ cc_library( deps = [ ":google_cloud_cpp_rest_internal", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_internal_emulator_integration_tests] @@ -345,7 +345,7 @@ cc_library( deps = [ ":google_cloud_cpp_rest_internal", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_internal_production_integration_tests] @@ -379,9 +379,9 @@ cc_library( "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/iam/admin/v1:admin_cc_grpc", - "@com_google_googletest//:gtest_main", + "@googletest//google/bigtable/admin/v2:admin_cc_grpc", + "@googletest//google/iam/admin/v1:admin_cc_grpc", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_rest_protobuf_internal_unit_tests] @@ -403,7 +403,7 @@ cc_library( ":google_cloud_cpp_universe_domain", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_universe_domain_unit_tests] diff --git a/google/cloud/accessapproval/BUILD.bazel b/google/cloud/accessapproval/BUILD.bazel index a18e446f3f00d..b14de61afab5b 100644 --- a/google/cloud/accessapproval/BUILD.bazel +++ b/google/cloud/accessapproval/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/accessapproval/v1:accessapproval_cc_grpc", + "@googleapis//google/cloud/accessapproval/v1:accessapproval_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/accesscontextmanager/BUILD.bazel b/google/cloud/accesscontextmanager/BUILD.bazel index 9970c6c24fbf3..143b23cb8844e 100644 --- a/google/cloud/accesscontextmanager/BUILD.bazel +++ b/google/cloud/accesscontextmanager/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_cc_grpc", + "@googleapis//google/identity/accesscontextmanager/v1:accesscontextmanager_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/advisorynotifications/BUILD.bazel b/google/cloud/advisorynotifications/BUILD.bazel index f7ac0e5cce0a3..c8b02f28eac04 100644 --- a/google/cloud/advisorynotifications/BUILD.bazel +++ b/google/cloud/advisorynotifications/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/advisorynotifications/v1:advisorynotifications_cc_grpc", + "@googleapis//google/cloud/advisorynotifications/v1:advisorynotifications_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/aiplatform/BUILD.bazel b/google/cloud/aiplatform/BUILD.bazel index 3a32819257484..b67fb44afc2f2 100644 --- a/google/cloud/aiplatform/BUILD.bazel +++ b/google/cloud/aiplatform/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/aiplatform/v1:aiplatform_cc_grpc", + "@googleapis//google/cloud/aiplatform/v1:aiplatform_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/alloydb/BUILD.bazel b/google/cloud/alloydb/BUILD.bazel index 9b90196e9337c..1a6fc0ddfa957 100644 --- a/google/cloud/alloydb/BUILD.bazel +++ b/google/cloud/alloydb/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/alloydb/v1:alloydb_cc_grpc", + "@googleapis//google/cloud/alloydb/v1:alloydb_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apigateway/BUILD.bazel b/google/cloud/apigateway/BUILD.bazel index 78feee464f8bc..7b34a88dd50fd 100644 --- a/google/cloud/apigateway/BUILD.bazel +++ b/google/cloud/apigateway/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/apigateway/v1:apigateway_cc_grpc", + "@googleapis//google/cloud/apigateway/v1:apigateway_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apigeeconnect/BUILD.bazel b/google/cloud/apigeeconnect/BUILD.bazel index 6a8714fa07948..c274e55b3bd79 100644 --- a/google/cloud/apigeeconnect/BUILD.bazel +++ b/google/cloud/apigeeconnect/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/apigeeconnect/v1:apigeeconnect_cc_grpc", + "@googleapis//google/cloud/apigeeconnect/v1:apigeeconnect_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apikeys/BUILD.bazel b/google/cloud/apikeys/BUILD.bazel index 5cdf8c63ef63e..1be25cbf1ae44 100644 --- a/google/cloud/apikeys/BUILD.bazel +++ b/google/cloud/apikeys/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/api/apikeys/v2:apikeys_cc_grpc", + "@googleapis//google/api/apikeys/v2:apikeys_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/appengine/BUILD.bazel b/google/cloud/appengine/BUILD.bazel index dbc35a71b2972..7e4deb9427d93 100644 --- a/google/cloud/appengine/BUILD.bazel +++ b/google/cloud/appengine/BUILD.bazel @@ -24,9 +24,9 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/appengine/legacy:legacy_cc_grpc", - "@com_google_googleapis//google/appengine/logging/v1:logging_cc_grpc", - "@com_google_googleapis//google/appengine/v1:appengine_cc_grpc", + "@googleapis//google/appengine/legacy:legacy_cc_grpc", + "@googleapis//google/appengine/logging/v1:logging_cc_grpc", + "@googleapis//google/appengine/v1:appengine_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/apphub/BUILD.bazel b/google/cloud/apphub/BUILD.bazel index 61ab437e885b4..a65ea4dbdfe27 100644 --- a/google/cloud/apphub/BUILD.bazel +++ b/google/cloud/apphub/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/apphub/v1:apphub_cc_grpc", + "@googleapis//google/cloud/apphub/v1:apphub_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/artifactregistry/BUILD.bazel b/google/cloud/artifactregistry/BUILD.bazel index 9d4f9177dd000..696b410646e0d 100644 --- a/google/cloud/artifactregistry/BUILD.bazel +++ b/google/cloud/artifactregistry/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/devtools/artifactregistry/v1:artifactregistry_cc_grpc", + "@googleapis//google/devtools/artifactregistry/v1:artifactregistry_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/asset/BUILD.bazel b/google/cloud/asset/BUILD.bazel index ac20e571b2aea..8f9655e33739c 100644 --- a/google/cloud/asset/BUILD.bazel +++ b/google/cloud/asset/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/asset/v1:asset_cc_grpc", + "@googleapis//google/cloud/asset/v1:asset_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/assuredworkloads/BUILD.bazel b/google/cloud/assuredworkloads/BUILD.bazel index c37769d131870..e999e230a4aee 100644 --- a/google/cloud/assuredworkloads/BUILD.bazel +++ b/google/cloud/assuredworkloads/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/assuredworkloads/v1:assuredworkloads_cc_grpc", + "@googleapis//google/cloud/assuredworkloads/v1:assuredworkloads_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/automl/BUILD.bazel b/google/cloud/automl/BUILD.bazel index 6572061302753..49ee509b3940d 100644 --- a/google/cloud/automl/BUILD.bazel +++ b/google/cloud/automl/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/automl/v1:automl_cc_grpc", + "@googleapis//google/cloud/automl/v1:automl_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/backupdr/BUILD.bazel b/google/cloud/backupdr/BUILD.bazel index 3376b9ace5870..0e6b09e36b3af 100644 --- a/google/cloud/backupdr/BUILD.bazel +++ b/google/cloud/backupdr/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/backupdr/v1:backupdr_cc_grpc", + "@googleapis//google/cloud/backupdr/v1:backupdr_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/baremetalsolution/BUILD.bazel b/google/cloud/baremetalsolution/BUILD.bazel index d716d05083e07..fadae5a55dd74 100644 --- a/google/cloud/baremetalsolution/BUILD.bazel +++ b/google/cloud/baremetalsolution/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/baremetalsolution/v2:baremetalsolution_cc_grpc", + "@googleapis//google/cloud/baremetalsolution/v2:baremetalsolution_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/batch/BUILD.bazel b/google/cloud/batch/BUILD.bazel index 9592453d25621..691baa13daf72 100644 --- a/google/cloud/batch/BUILD.bazel +++ b/google/cloud/batch/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/batch/v1:batch_cc_grpc", + "@googleapis//google/cloud/batch/v1:batch_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/bigquery/BUILD.bazel b/google/cloud/bigquery/BUILD.bazel index 93876335f8980..42d3c8948269b 100644 --- a/google/cloud/bigquery/BUILD.bazel +++ b/google/cloud/bigquery/BUILD.bazel @@ -83,7 +83,7 @@ cc_library( visibility = ["//:__subpackages__"], deps = [ ":google_cloud_cpp_bigquery_rest", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -98,7 +98,7 @@ cc_library( ":google_cloud_cpp_bigquery_rest_mocks", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -112,6 +112,6 @@ cc_library( "//google/cloud:google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) for test in bigquery_rest_unit_tests] diff --git a/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel b/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel index 3ee10d0eed017..6dbb039fe44ea 100644 --- a/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel +++ b/google/cloud/bigquery/v2/minimal/benchmarks/BUILD.bazel @@ -33,7 +33,7 @@ cc_library( "//google/cloud/bigquery:google_cloud_cpp_bigquery_rest_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -50,8 +50,8 @@ cc_library( "//google/cloud/bigquery:google_cloud_cpp_bigquery_rest_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) for test in experimental_bigquery_rest_client_benchmark_unit_tests] diff --git a/google/cloud/bigtable/BUILD.bazel b/google/cloud/bigtable/BUILD.bazel index e4800341979f8..cae091dbca7c6 100644 --- a/google/cloud/bigtable/BUILD.bazel +++ b/google/cloud/bigtable/BUILD.bazel @@ -39,12 +39,12 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_google_absl//absl/strings:str_format", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", - "@com_google_googleapis//google/rpc:error_details_cc_proto", - "@com_github_grpc_grpc//:grpc++", + "@abseil-cpp//absl/strings:str_format", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/bigtable/v2:bigtable_cc_grpc", + "@googleapis//google/longrunning:longrunning_cc_grpc", + "@googleapis//google/rpc:error_details_cc_proto", + "@grpc//:grpc++", ], ) @@ -67,7 +67,7 @@ cc_library( ":google_cloud_cpp_bigtable", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -84,7 +84,7 @@ cc_library( "//:grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -98,7 +98,7 @@ cc_library( "//:grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in bigtable_client_unit_tests] @@ -115,6 +115,6 @@ cc_test( "//:grpc_utils", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/bigtable/benchmarks/BUILD.bazel b/google/cloud/bigtable/benchmarks/BUILD.bazel index d38595bf6c969..2215e0a2f1f88 100644 --- a/google/cloud/bigtable/benchmarks/BUILD.bazel +++ b/google/cloud/bigtable/benchmarks/BUILD.bazel @@ -60,6 +60,6 @@ cc_library( "//:bigtable", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in bigtable_benchmarks_unit_tests] diff --git a/google/cloud/bigtable/examples/BUILD.bazel b/google/cloud/bigtable/examples/BUILD.bazel index 43dec7a426ba5..2d96c2611c2d9 100644 --- a/google/cloud/bigtable/examples/BUILD.bazel +++ b/google/cloud/bigtable/examples/BUILD.bazel @@ -31,8 +31,8 @@ cc_library( "//:grpc_utils", "//google/cloud/bigtable:bigtable_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googleapis//google/bigtable/admin/v2:admin_cc_grpc", - "@com_google_googleapis//google/bigtable/v2:bigtable_cc_grpc", + "@googleapis//google/bigtable/admin/v2:admin_cc_grpc", + "@googleapis//google/bigtable/v2:bigtable_cc_grpc", ], ) @@ -50,7 +50,7 @@ filtered_unit_tests = [test for test in bigtable_examples_unit_tests if not test "//:grpc_utils", "//google/cloud/bigtable:bigtable_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in filtered_unit_tests] @@ -60,7 +60,7 @@ cc_test( deps = [ "//google/cloud/bigtable:google_cloud_cpp_bigtable", "//google/cloud/bigtable:google_cloud_cpp_bigtable_mocks", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/bigtable/test_proxy/BUILD.bazel b/google/cloud/bigtable/test_proxy/BUILD.bazel index ad7f5bef723ea..596db91a3f26a 100644 --- a/google/cloud/bigtable/test_proxy/BUILD.bazel +++ b/google/cloud/bigtable/test_proxy/BUILD.bazel @@ -29,10 +29,10 @@ proto_library( name = "test_proxy_proto", srcs = ["test_proxy.proto"], deps = [ - "@com_google_googleapis//google/api:client_proto", - "@com_google_googleapis//google/bigtable/v2:bigtable_proto", - "@com_google_googleapis//google/rpc:status_proto", - "@com_google_protobuf//:duration_proto", + "@googleapis//google/api:client_proto", + "@googleapis//google/bigtable/v2:bigtable_proto", + "@googleapis//google/rpc:status_proto", + "@protobuf//:duration_proto", ], ) diff --git a/google/cloud/bigtable/tests/BUILD.bazel b/google/cloud/bigtable/tests/BUILD.bazel index 72d44baed557d..c4974a2b00849 100644 --- a/google/cloud/bigtable/tests/BUILD.bazel +++ b/google/cloud/bigtable/tests/BUILD.bazel @@ -34,7 +34,7 @@ licenses(["notice"]) # Apache 2.0 "//:grpc_utils", "//google/cloud/bigtable:bigtable_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in bigtable_client_integration_tests] diff --git a/google/cloud/billing/BUILD.bazel b/google/cloud/billing/BUILD.bazel index f5f10cc56d4dd..69172d552ab62 100644 --- a/google/cloud/billing/BUILD.bazel +++ b/google/cloud/billing/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/billing/budgets/v1:budgets_cc_grpc", - "@com_google_googleapis//google/cloud/billing/v1:billing_cc_grpc", + "@googleapis//google/cloud/billing/budgets/v1:budgets_cc_grpc", + "@googleapis//google/cloud/billing/v1:billing_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/binaryauthorization/BUILD.bazel b/google/cloud/binaryauthorization/BUILD.bazel index 98ae06be8651f..98ced73d88efe 100644 --- a/google/cloud/binaryauthorization/BUILD.bazel +++ b/google/cloud/binaryauthorization/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/binaryauthorization/v1:binaryauthorization_cc_grpc", + "@googleapis//google/cloud/binaryauthorization/v1:binaryauthorization_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/cloudquotas/BUILD.bazel b/google/cloud/cloudquotas/BUILD.bazel index 7929be1bd3354..c5960f7fe9a56 100644 --- a/google/cloud/cloudquotas/BUILD.bazel +++ b/google/cloud/cloudquotas/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/api/cloudquotas/v1:cloudquotas_cc_grpc", + "@googleapis//google/api/cloudquotas/v1:cloudquotas_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/commerce/BUILD.bazel b/google/cloud/commerce/BUILD.bazel index 3f6c419fd9dee..90e894cc5492b 100644 --- a/google/cloud/commerce/BUILD.bazel +++ b/google/cloud/commerce/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["consumer/procurement/v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_cc_grpc", + "@googleapis//google/cloud/commerce/consumer/procurement/v1:procurement_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/compute/compute_library.bzl b/google/cloud/compute/compute_library.bzl index 014e2840bfee1..17cc188ecd702 100644 --- a/google/cloud/compute/compute_library.bzl +++ b/google/cloud/compute/compute_library.bzl @@ -63,7 +63,7 @@ def compute_library(service_dir, inner_deps = []): visibility = ["//:__pkg__"], deps = [ ":google_cloud_cpp_compute_" + service, - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) diff --git a/google/cloud/contactcenterinsights/BUILD.bazel b/google/cloud/contactcenterinsights/BUILD.bazel index c900667d6cbf1..0537f29ec8d91 100644 --- a/google/cloud/contactcenterinsights/BUILD.bazel +++ b/google/cloud/contactcenterinsights/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/contactcenterinsights/v1:contactcenterinsights_cc_grpc", + "@googleapis//google/cloud/contactcenterinsights/v1:contactcenterinsights_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/container/BUILD.bazel b/google/cloud/container/BUILD.bazel index b2d7b3b02cbc1..2f22818e36883 100644 --- a/google/cloud/container/BUILD.bazel +++ b/google/cloud/container/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/container/v1:container_cc_grpc", + "@googleapis//google/container/v1:container_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/containeranalysis/BUILD.bazel b/google/cloud/containeranalysis/BUILD.bazel index f4ece6c9cb439..668fe3f4bebf0 100644 --- a/google/cloud/containeranalysis/BUILD.bazel +++ b/google/cloud/containeranalysis/BUILD.bazel @@ -24,8 +24,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/devtools/containeranalysis/v1:containeranalysis_cc_grpc", - "@com_google_googleapis//grafeas/v1:grafeas_cc_grpc", + "@googleapis//google/devtools/containeranalysis/v1:containeranalysis_cc_grpc", + "@googleapis//grafeas/v1:grafeas_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/contentwarehouse/BUILD.bazel b/google/cloud/contentwarehouse/BUILD.bazel index b5a662ef40055..03f9997275e6f 100644 --- a/google/cloud/contentwarehouse/BUILD.bazel +++ b/google/cloud/contentwarehouse/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/contentwarehouse/v1:contentwarehouse_cc_grpc", + "@googleapis//google/cloud/contentwarehouse/v1:contentwarehouse_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/documentai/BUILD.bazel b/google/cloud/documentai/BUILD.bazel index cbc64b17a5a32..83abd73c05599 100644 --- a/google/cloud/documentai/BUILD.bazel +++ b/google/cloud/documentai/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/documentai/v1:documentai_cc_grpc", + "@googleapis//google/cloud/documentai/v1:documentai_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/domains/BUILD.bazel b/google/cloud/domains/BUILD.bazel index 652bd9f403d81..42424ef8cbcd2 100644 --- a/google/cloud/domains/BUILD.bazel +++ b/google/cloud/domains/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/domains/v1:domains_cc_grpc", + "@googleapis//google/cloud/domains/v1:domains_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/filestore/BUILD.bazel b/google/cloud/filestore/BUILD.bazel index d90f41dfd7641..ff9759b80166b 100644 --- a/google/cloud/filestore/BUILD.bazel +++ b/google/cloud/filestore/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/filestore/v1:filestore_cc_grpc", + "@googleapis//google/cloud/filestore/v1:filestore_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/functions/BUILD.bazel b/google/cloud/functions/BUILD.bazel index 6cc8a2816c353..8053f5d4fffcc 100644 --- a/google/cloud/functions/BUILD.bazel +++ b/google/cloud/functions/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/functions/v1:functions_cc_grpc", - "@com_google_googleapis//google/cloud/functions/v2:functions_cc_grpc", + "@googleapis//google/cloud/functions/v1:functions_cc_grpc", + "@googleapis//google/cloud/functions/v2:functions_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/gkebackup/BUILD.bazel b/google/cloud/gkebackup/BUILD.bazel index 8a288759bd8e3..b8f01aa36d207 100644 --- a/google/cloud/gkebackup/BUILD.bazel +++ b/google/cloud/gkebackup/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/gkebackup/v1:gkebackup_cc_grpc", + "@googleapis//google/cloud/gkebackup/v1:gkebackup_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/logging/integration_tests/BUILD.bazel b/google/cloud/logging/integration_tests/BUILD.bazel index f402f2a7b4433..e2ad738fb83c3 100644 --- a/google/cloud/logging/integration_tests/BUILD.bazel +++ b/google/cloud/logging/integration_tests/BUILD.bazel @@ -30,6 +30,6 @@ licenses(["notice"]) # Apache 2.0 "//:logging", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in logging_client_integration_tests] diff --git a/google/cloud/oauth2/BUILD.bazel b/google/cloud/oauth2/BUILD.bazel index 9c183403236b5..b5b3f4d2d7c19 100644 --- a/google/cloud/oauth2/BUILD.bazel +++ b/google/cloud/oauth2/BUILD.bazel @@ -43,6 +43,6 @@ cc_library( ":google_cloud_cpp_oauth2", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_oauth2_unit_tests] diff --git a/google/cloud/opentelemetry/BUILD.bazel b/google/cloud/opentelemetry/BUILD.bazel index c47262a611ebd..08065ff265602 100644 --- a/google/cloud/opentelemetry/BUILD.bazel +++ b/google/cloud/opentelemetry/BUILD.bazel @@ -34,8 +34,8 @@ cc_library( "//:monitoring", "//:trace", "//google/cloud:google_cloud_cpp_rest_internal", - "@io_opentelemetry_cpp//sdk/src/metrics", - "@io_opentelemetry_cpp//sdk/src/trace", + "@opentelemetry-cpp//sdk/src/metrics", + "@opentelemetry-cpp//sdk/src/trace", ], ) diff --git a/google/cloud/opentelemetry/integration_tests/BUILD.bazel b/google/cloud/opentelemetry/integration_tests/BUILD.bazel index ab46542ae62dd..592eff7d7dfac 100644 --- a/google/cloud/opentelemetry/integration_tests/BUILD.bazel +++ b/google/cloud/opentelemetry/integration_tests/BUILD.bazel @@ -27,6 +27,6 @@ licenses(["notice"]) # Apache 2.0 "//:opentelemetry", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in opentelemetry_integration_tests] diff --git a/google/cloud/pubsub/BUILD.bazel b/google/cloud/pubsub/BUILD.bazel index 59bc8b0f07d40..d1366c18b3762 100644 --- a/google/cloud/pubsub/BUILD.bazel +++ b/google/cloud/pubsub/BUILD.bazel @@ -38,9 +38,9 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_google_googleapis//google/pubsub/v1:pubsub_cc_grpc", + "@googleapis//google/pubsub/v1:pubsub_cc_grpc", # Do not sort: grpc++ must come last - "@com_github_grpc_grpc//:grpc++", + "@grpc//:grpc++", ], ) @@ -56,7 +56,7 @@ cc_library( ":google_cloud_cpp_pubsub", "//:common", "//:grpc_utils", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -90,7 +90,7 @@ cc_library( ], deps = [ ":google_cloud_cpp_pubsub", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -104,7 +104,7 @@ cc_library( "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/strings:str_format", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings:str_format", + "@googletest//:gtest_main", ], ) for test in pubsub_client_unit_tests] diff --git a/google/cloud/pubsub/integration_tests/BUILD.bazel b/google/cloud/pubsub/integration_tests/BUILD.bazel index cfbc7503aa0ce..06abad4ebc691 100644 --- a/google/cloud/pubsub/integration_tests/BUILD.bazel +++ b/google/cloud/pubsub/integration_tests/BUILD.bazel @@ -31,6 +31,6 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/pubsub:pubsub_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsub_client_integration_tests] diff --git a/google/cloud/pubsub/samples/BUILD.bazel b/google/cloud/pubsub/samples/BUILD.bazel index e7fa34774d4f4..4f97aa7cb6e84 100644 --- a/google/cloud/pubsub/samples/BUILD.bazel +++ b/google/cloud/pubsub/samples/BUILD.bazel @@ -45,7 +45,7 @@ cc_library( "//:common", "//:pubsub", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsub_samples_unit_tests] @@ -88,6 +88,6 @@ cc_proto_library( "//:pubsub", "//:pubsub_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsub_client_unit_samples] diff --git a/google/cloud/pubsublite/BUILD.bazel b/google/cloud/pubsublite/BUILD.bazel index c94f5eba9a76c..5cb951a2e61bf 100644 --- a/google/cloud/pubsublite/BUILD.bazel +++ b/google/cloud/pubsublite/BUILD.bazel @@ -54,7 +54,7 @@ cc_library( visibility = ["//:__pkg__"], deps = [ ":google_cloud_cpp_pubsublite", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -85,8 +85,8 @@ cc_library( "//:mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/memory", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/memory", + "@googletest//:gtest_main", ], ) for test in pubsublite_unit_tests diff --git a/google/cloud/pubsublite/integration_tests/BUILD.bazel b/google/cloud/pubsublite/integration_tests/BUILD.bazel index dafc0b4bd8e8e..90d18e5b529c3 100644 --- a/google/cloud/pubsublite/integration_tests/BUILD.bazel +++ b/google/cloud/pubsublite/integration_tests/BUILD.bazel @@ -31,6 +31,6 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/pubsublite:pubsublite_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in pubsublite_client_integration_tests] diff --git a/google/cloud/spanner/BUILD.bazel b/google/cloud/spanner/BUILD.bazel index 2ba5708d570e2..d3d48c313a4b0 100644 --- a/google/cloud/spanner/BUILD.bazel +++ b/google/cloud/spanner/BUILD.bazel @@ -40,16 +40,16 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_google_absl//absl/container:fixed_array", - "@com_google_absl//absl/numeric:int128", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_googleapis//google/longrunning:longrunning_cc_grpc", - "@com_google_googleapis//google/spanner/admin/database/v1:database_cc_grpc", - "@com_google_googleapis//google/spanner/admin/instance/v1:instance_cc_grpc", - "@com_google_googleapis//google/spanner/v1:spanner_cc_grpc", + "@abseil-cpp//absl/container:fixed_array", + "@abseil-cpp//absl/numeric:int128", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@googleapis//google/longrunning:longrunning_cc_grpc", + "@googleapis//google/spanner/admin/database/v1:database_cc_grpc", + "@googleapis//google/spanner/admin/instance/v1:instance_cc_grpc", + "@googleapis//google/spanner/v1:spanner_cc_grpc", # Do not sort: grpc++ must come last - "@com_github_grpc_grpc//:grpc++", + "@grpc//:grpc++", ], ) @@ -87,7 +87,7 @@ cc_library( ":google_cloud_cpp_spanner", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -122,8 +122,8 @@ cc_library( ":singer_cc_proto", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest_main", ], ) @@ -152,8 +152,8 @@ cc_library( "//google/cloud:google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/numeric:int128", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/numeric:int128", + "@googletest//:gtest_main", ], ) for test in spanner_client_unit_tests] diff --git a/google/cloud/spanner/admin/integration_tests/BUILD.bazel b/google/cloud/spanner/admin/integration_tests/BUILD.bazel index affef991023c5..6f9755cdb236b 100644 --- a/google/cloud/spanner/admin/integration_tests/BUILD.bazel +++ b/google/cloud/spanner/admin/integration_tests/BUILD.bazel @@ -30,7 +30,7 @@ licenses(["notice"]) # Apache 2.0 "//:spanner", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_admin_integration_tests] @@ -46,6 +46,6 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/spanner:google_cloud_cpp_spanner_rest", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_admin_integration_tests_rest] diff --git a/google/cloud/spanner/benchmarks/BUILD.bazel b/google/cloud/spanner/benchmarks/BUILD.bazel index 69b5801d80a7c..359a4783dbac1 100644 --- a/google/cloud/spanner/benchmarks/BUILD.bazel +++ b/google/cloud/spanner/benchmarks/BUILD.bazel @@ -30,7 +30,7 @@ cc_library( "//:spanner_mocks", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/spanner/integration_tests/BUILD.bazel b/google/cloud/spanner/integration_tests/BUILD.bazel index bf60f46416dfa..37bae6c2af998 100644 --- a/google/cloud/spanner/integration_tests/BUILD.bazel +++ b/google/cloud/spanner/integration_tests/BUILD.bazel @@ -33,6 +33,6 @@ licenses(["notice"]) # Apache 2.0 "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_client_integration_tests] diff --git a/google/cloud/spanner/samples/BUILD.bazel b/google/cloud/spanner/samples/BUILD.bazel index cb112719c01e4..9db0cb7d2b180 100644 --- a/google/cloud/spanner/samples/BUILD.bazel +++ b/google/cloud/spanner/samples/BUILD.bazel @@ -45,6 +45,6 @@ licenses(["notice"]) # Apache 2.0 "//:spanner", "//google/cloud/spanner:spanner_client_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in spanner_client_unit_samples] diff --git a/google/cloud/sql/BUILD.bazel b/google/cloud/sql/BUILD.bazel index 31e9574a1bcbf..d2237d9d1950d 100644 --- a/google/cloud/sql/BUILD.bazel +++ b/google/cloud/sql/BUILD.bazel @@ -63,7 +63,7 @@ cc_library( "//:grpc_utils", "//google/cloud:google_cloud_cpp_rest_internal", "//google/cloud:google_cloud_cpp_rest_protobuf_internal", - "@com_google_googleapis//google/cloud/sql/v1:sql_cc_proto", + "@googleapis//google/cloud/sql/v1:sql_cc_proto", ], ) @@ -73,7 +73,7 @@ cc_library( visibility = ["//:__pkg__"], deps = [ ":google_cloud_cpp_sql", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) diff --git a/google/cloud/storage/BUILD.bazel b/google/cloud/storage/BUILD.bazel index d84a12dbf48b4..b0aad95764a4f 100644 --- a/google/cloud/storage/BUILD.bazel +++ b/google/cloud/storage/BUILD.bazel @@ -74,20 +74,20 @@ cc_library( deps = [ ":google_cloud_cpp_storage", "//:grpc_utils", - "@com_github_curl_curl//:curl", - "@com_github_google_crc32c//:crc32c", - "@com_github_grpc_grpc//:grpc++", - "@com_github_nlohmann_json//:nlohmann_json", - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_googleapis//google/storage/v2:storage_cc_grpc", - "@com_google_googleapis//google/storage/v2:storage_cc_proto", + "@curl//:curl", + "@crc32c//:crc32c", + "@grpc//:grpc++", + "@nlohmann_json//:nlohmann_json", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@googleapis//google/storage/v2:storage_cc_grpc", + "@googleapis//google/storage/v2:storage_cc_proto", ] + select({ ":grpc_metrics_enabled": [ "//:opentelemetry", - "@com_github_grpc_grpc//:grpcpp_otel_plugin", - "@io_opentelemetry_cpp//sdk/src/metrics", + "@grpc//:grpcpp_otel_plugin", + "@opentelemetry-cpp//sdk/src/metrics", ], "//conditions:default": [], }), @@ -110,7 +110,7 @@ cc_library( deps = [ ":google_cloud_cpp_storage", ":google_cloud_cpp_storage_grpc", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -141,14 +141,14 @@ cc_library( deps = [ "//:common", "//google/cloud:google_cloud_cpp_rest_internal", - "@com_github_curl_curl//:curl", - "@com_github_google_crc32c//:crc32c", - "@com_github_nlohmann_json//:nlohmann_json", - "@com_google_absl//absl/strings:cord", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/time", - "@com_google_absl//absl/types:span", - "@com_google_absl//absl/types:variant", + "@curl", + "@crc32c", + "@nlohmann_json//:json", + "@abseil-cpp//absl/strings:cord", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/types:span", + "@abseil-cpp//absl/types:variant", ] + select({ "@platforms//os:windows": [], "//conditions:default": [ @@ -177,7 +177,7 @@ cc_library( deps = [ ":google_cloud_cpp_storage", "//:common", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -194,8 +194,8 @@ cc_library( "//google/cloud:google_cloud_cpp_mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_private", "//google/cloud/testing_util:google_cloud_cpp_testing_rest_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest_main", + "@curl//:curl", + "@googletest//:gtest_main", ], ) @@ -211,8 +211,8 @@ cc_library( ":storage_client_testing", "//:common", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest_main", + "@curl", + "@googletest//:gtest_main", ] + select({ "@platforms//os:windows": [], "//conditions:default": [ @@ -246,9 +246,9 @@ cc_library( "//:mocks", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", + "@curl//:curl", + "@googletest//:gtest", + "@googletest//:gtest_main", ], ) for test in storage_client_grpc_unit_tests] diff --git a/google/cloud/storage/benchmarks/BUILD.bazel b/google/cloud/storage/benchmarks/BUILD.bazel index ea38441061bcc..e02ef257c8337 100644 --- a/google/cloud/storage/benchmarks/BUILD.bazel +++ b/google/cloud/storage/benchmarks/BUILD.bazel @@ -35,9 +35,9 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googleapis//google/storage/v2:storage_cc_grpc", - "@com_google_googleapis//google/storage/v2:storage_cc_proto", + "@curl", + "@googleapis//google/storage/v2:storage_cc_grpc", + "@googleapis//google/storage/v2:storage_cc_proto", ], ) @@ -55,8 +55,8 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_absl//absl/strings", + "@curl", + "@abseil-cpp//absl/strings", ], ) for program in storage_benchmark_programs] @@ -73,8 +73,8 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_github_curl_curl//:curl", - "@com_google_googletest//:gtest_main", + "@curl", + "@googletest//:gtest_main", ], ) for test in storage_benchmarks_unit_tests] diff --git a/google/cloud/storage/examples/BUILD.bazel b/google/cloud/storage/examples/BUILD.bazel index e8dd9398fcb5e..518713fcb9e01 100644 --- a/google/cloud/storage/examples/BUILD.bazel +++ b/google/cloud/storage/examples/BUILD.bazel @@ -43,7 +43,7 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in storage_examples_unit_tests] @@ -73,7 +73,7 @@ cc_library( "//:storage", "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in storage_grpc_unit_tests] diff --git a/google/cloud/storage/tests/BUILD.bazel b/google/cloud/storage/tests/BUILD.bazel index 6ce3f7f5dc568..c0d201d18c19e 100644 --- a/google/cloud/storage/tests/BUILD.bazel +++ b/google/cloud/storage/tests/BUILD.bazel @@ -62,7 +62,7 @@ VARIATIONS = { "//google/cloud/storage:storage_client_testing", "//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private", "//google/cloud/testing_util:google_cloud_cpp_testing_private", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/strings", + "@googletest//:gtest_main", ], ) for test in storage_client_integration_tests for v_label, v_env in VARIATIONS.items()] diff --git a/google/cloud/testing_util/BUILD.bazel b/google/cloud/testing_util/BUILD.bazel index 64d99f32d92b2..3e95ac22a1f6f 100644 --- a/google/cloud/testing_util/BUILD.bazel +++ b/google/cloud/testing_util/BUILD.bazel @@ -41,13 +41,13 @@ cc_library( }), deps = [ "//:common", - "@com_google_absl//absl/debugging:failure_signal_handler", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_googletest//:gtest_main", + "@abseil-cpp//absl/debugging:failure_signal_handler", + "@abseil-cpp//absl/debugging:symbolize", + "@googletest//:gtest_main", ] + select({ "//google/cloud:enable_opentelemetry_valid": [ - "@io_opentelemetry_cpp//exporters/memory:in_memory_span_exporter", - "@io_opentelemetry_cpp//sdk/src/trace", + "@opentelemetry-cpp//exporters/memory:in_memory_span_exporter", + "@opentelemetry-cpp//sdk/src/trace", ], "//conditions:default": [], }), @@ -71,7 +71,7 @@ cc_library( deps = [ ":google_cloud_cpp_testing", "//:common", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for test in google_cloud_cpp_testing_unit_tests] @@ -83,12 +83,12 @@ cc_library( deps = [ "//:common", "//:grpc_utils", - "@com_github_grpc_grpc//:grpc++", - "@com_google_googleapis//:googleapis_system_includes", - "@com_google_googleapis//google/api:annotations_cc_proto", - "@com_google_googleapis//google/api:routing_cc_proto", - "@com_google_googletest//:gtest_main", - "@com_google_protobuf//:protobuf", + "@grpc//:grpc++", + "@googleapis//:googleapis_system_includes", + "@googleapis//google/api:annotations_cc_proto", + "@googleapis//google/api:routing_cc_proto", + "@googletest//:gtest_main", + "@protobuf//:protobuf", ], ) @@ -110,8 +110,8 @@ cc_library( deps = [ ":google_cloud_cpp_testing_grpc", "//:common", - "@com_google_googletest//:gtest_main", - "@com_google_protobuf//:protobuf", + "@googletest//:gtest_main", + "@protobuf//:protobuf", ], ) for test in google_cloud_cpp_testing_grpc_unit_tests] @@ -122,7 +122,7 @@ cc_library( hdrs = google_cloud_cpp_testing_rest_hdrs, deps = [ "//google/cloud:google_cloud_cpp_rest_internal", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/vmwareengine/BUILD.bazel b/google/cloud/vmwareengine/BUILD.bazel index afeffa991623b..c04055c1a23f4 100644 --- a/google/cloud/vmwareengine/BUILD.bazel +++ b/google/cloud/vmwareengine/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/vmwareengine/v1:vmwareengine_cc_grpc", + "@googleapis//google/cloud/vmwareengine/v1:vmwareengine_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/vpcaccess/BUILD.bazel b/google/cloud/vpcaccess/BUILD.bazel index 9cd861c7e9d8e..8de07eb488011 100644 --- a/google/cloud/vpcaccess/BUILD.bazel +++ b/google/cloud/vpcaccess/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/vpcaccess/v1:vpcaccess_cc_grpc", + "@googleapis//google/cloud/vpcaccess/v1:vpcaccess_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/webrisk/BUILD.bazel b/google/cloud/webrisk/BUILD.bazel index 282bf5a26d552..78bb9a3164fd3 100644 --- a/google/cloud/webrisk/BUILD.bazel +++ b/google/cloud/webrisk/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/webrisk/v1:webrisk_cc_grpc", + "@googleapis//google/cloud/webrisk/v1:webrisk_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/websecurityscanner/BUILD.bazel b/google/cloud/websecurityscanner/BUILD.bazel index c71b33972c793..6574a2f9db903 100644 --- a/google/cloud/websecurityscanner/BUILD.bazel +++ b/google/cloud/websecurityscanner/BUILD.bazel @@ -24,7 +24,7 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/websecurityscanner/v1:websecurityscanner_cc_grpc", + "@googleapis//google/cloud/websecurityscanner/v1:websecurityscanner_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/workflows/BUILD.bazel b/google/cloud/workflows/BUILD.bazel index 86dd942860f47..fa5eeb41e48cd 100644 --- a/google/cloud/workflows/BUILD.bazel +++ b/google/cloud/workflows/BUILD.bazel @@ -25,8 +25,8 @@ service_dirs = [ ] googleapis_deps = [ - "@com_google_googleapis//google/cloud/workflows/executions/v1:executions_cc_grpc", - "@com_google_googleapis//google/cloud/workflows/v1:workflows_cc_grpc", + "@googleapis//google/cloud/workflows/executions/v1:executions_cc_grpc", + "@googleapis//google/cloud/workflows/v1:workflows_cc_grpc", ] cc_gapic_library( diff --git a/google/cloud/workstations/BUILD.bazel b/google/cloud/workstations/BUILD.bazel index 92812cdbf3b8d..b7b5a95430f3f 100644 --- a/google/cloud/workstations/BUILD.bazel +++ b/google/cloud/workstations/BUILD.bazel @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0 service_dirs = ["v1/"] googleapis_deps = [ - "@com_google_googleapis//google/cloud/workstations/v1:workstations_cc_grpc", + "@googleapis//google/cloud/workstations/v1:workstations_cc_grpc", ] cc_gapic_library( diff --git a/protos/google/cloud/compute/BUILD.bazel b/protos/google/cloud/compute/BUILD.bazel index 1cc9073df5b2c..29f41bcba5637 100644 --- a/protos/google/cloud/compute/BUILD.bazel +++ b/protos/google/cloud/compute/BUILD.bazel @@ -46,15 +46,15 @@ proto_library( "//google/cloud/compute:__pkg__", ], deps = [ - "@com_google_googleapis//google/api:annotations_proto", - "@com_google_googleapis//google/api:client_proto", - "@com_google_googleapis//google/api:field_behavior_proto", - "@com_google_googleapis//google/api:http_proto", - "@com_google_googleapis//google/api:resource_proto", - "@com_google_googleapis//google/api:routing_proto", - "@com_google_googleapis//google/cloud:extended_operations_proto", - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:empty_proto", + "@googleapis//google/api:annotations_proto", + "@googleapis//google/api:client_proto", + "@googleapis//google/api:field_behavior_proto", + "@googleapis//google/api:http_proto", + "@googleapis//google/api:resource_proto", + "@googleapis//google/api:routing_proto", + "@googleapis//google/cloud:extended_operations_proto", + "@protobuf//:any_proto", + "@protobuf//:empty_proto", ], )