Skip to content

Commit 911d67d

Browse files
authored
feat: update dependencies to use canonical repository names (googleapis#15346)
* feat: update dependencies to use canonical repository names * feat: use canonical names in bazel/gapic.bzl * feat: use canonical names in compute_library.bzl * chore: format BUILD.bazel using buildifier * feat: use bzlmod for verify_targets * feat: update repo name for generator
1 parent a7f295e commit 911d67d

492 files changed

Lines changed: 3310 additions & 3396 deletions

File tree

Some content is hidden

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

MODULE.bazel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ module(
2323
bazel_dep(name = "platforms", version = "0.0.11")
2424
bazel_dep(name = "bazel_skylib", version = "1.8.1")
2525
bazel_dep(name = "rules_cc", version = "0.1.4")
26-
bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "abseil-cpp")
27-
bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
26+
bazel_dep(name = "abseil-cpp", version = "20250127.1")
27+
bazel_dep(name = "protobuf", version = "31.1")
2828
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
29-
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
30-
bazel_dep(name = "curl", version = "8.8.0.bcr.3", repo_name = "com_github_curl_curl")
31-
bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c")
32-
bazel_dep(name = "opentelemetry-cpp", version = "1.19.0", repo_name = "io_opentelemetry_cpp")
29+
bazel_dep(name = "nlohmann_json", version = "3.11.3")
30+
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
31+
bazel_dep(name = "crc32c", version = "1.1.0")
32+
bazel_dep(name = "opentelemetry-cpp", version = "1.19.0")
3333
bazel_dep(name = "rules_proto", version = "7.1.0")
3434
bazel_dep(name = "rules_python", version = "1.4.1")
3535
bazel_dep(name = "rules_apple", version = "3.16.0")
36-
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
36+
bazel_dep(name = "googletest", version = "1.15.2")
3737

3838
bazel_dep(name = "google_benchmark", version = "1.9.2", dev_dependency = True, repo_name = "com_google_benchmark")
3939
bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp")
@@ -52,7 +52,7 @@ python.toolchain(
5252
python_version = "3.11",
5353
)
5454

55-
bazel_dep(name = "grpc", version = "1.72.0", repo_name = "com_github_grpc_grpc")
56-
bazel_dep(name = "googleapis", version = "0.0.0-20250703-f9d6fe4a", repo_name = "com_google_googleapis")
55+
bazel_dep(name = "grpc", version = "1.72.0")
56+
bazel_dep(name = "googleapis", version = "0.0.0-20250703-f9d6fe4a")
5757
bazel_dep(name = "googleapis-cc", version = "1.0.0")
5858
bazel_dep(name = "googleapis-grpc-cc", version = "1.0.0")

bazel/gapic.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
7272
visibility = ["//:__pkg__"],
7373
deps = [
7474
":google_cloud_cpp_" + name,
75-
"@com_google_googletest//:gtest",
75+
"@googletest//:gtest",
7676
],
7777
)
7878

bazel/workspace0.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def gl_cpp_workspace0(name = None):
133133
# Load the googleapis dependency.
134134
maybe(
135135
http_archive,
136-
name = "com_google_googleapis",
136+
name = "googleapis",
137137
urls = [
138138
"https://github.com/googleapis/googleapis/archive/f9d6fe4a6ad9ed89dfc315f284124d2104377940.tar.gz",
139139
],

bazel/workspace2.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
1818
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
1919
load(
20-
"@com_google_googleapis//:repository_rules.bzl",
20+
"@googleapis//:repository_rules.bzl",
2121
"switched_rules_by_language",
2222
)
2323
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies")
@@ -38,9 +38,9 @@ def gl_cpp_workspace2(name = None):
3838

3939
rules_cc_dependencies()
4040

41-
# Configure @com_google_googleapis to only compile C++ and gRPC libraries.
41+
# Configure @googleapis to only compile C++ and gRPC libraries.
4242
switched_rules_by_language(
43-
name = "com_google_googleapis_imports",
43+
name = "googleapis_imports",
4444
cc = True,
4545
grpc = True,
4646
)

ci/verify_current_targets/.bazelrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ build:macos --host_cxxopt=-std=c++17
2828
# the project separately.
2929
build --experimental_convenience_symlinks=ignore
3030

31-
# TODO(#11485) - enable bzlmod once it works
32-
common --noenable_bzlmod
33-
common --enable_workspace
34-
3531
# TODO(#13311) - remove once gRPC works with Bazel v7 or when gRPC stops using
3632
# `apple_rules`.
3733
common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module(name = "google-cloud-cpp-verify-current-targets")
2+
3+
bazel_dep(name = "google_cloud_cpp", version = "0.0.0")
4+
local_path_override(
5+
module_name = "google_cloud_cpp",
6+
path = "../..",
7+
)

ci/verify_current_targets/WORKSPACE.bazel

Lines changed: 0 additions & 44 deletions
This file was deleted.

ci/verify_deprecated_targets/.bazelrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ build:macos --host_cxxopt=-std=c++17
2828
# the project separately.
2929
build --experimental_convenience_symlinks=ignore
3030

31-
# TODO(#11485) - enable bzlmod once it works
32-
common --noenable_bzlmod
33-
common --enable_workspace
34-
3531
# TODO(#13311) - remove once gRPC works with Bazel v7 or when gRPC stops using
3632
# `apple_rules`.
3733
common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module(name = "google-cloud-cpp-verify-deprecated-targets")
2+
3+
bazel_dep(name = "google_cloud_cpp", version = "0.0.0")
4+
local_path_override(
5+
module_name = "google_cloud_cpp",
6+
path = "../..",
7+
)

ci/verify_deprecated_targets/WORKSPACE.bazel

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)