Skip to content

Commit 6199228

Browse files
committed
resolve rebase issues
1 parent 5e332c0 commit 6199228

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ python.toolchain(
5353
)
5454

5555
bazel_dep(name = "grpc", version = "1.74.1")
56-
bazel_dep(name = "googleapis", version = "0.0.0-20250703-f9d6fe4a")
56+
bazel_dep(name = "googleapis", version = "0.0.0-20250730-f6801ce4")
5757
bazel_dep(name = "googleapis-cc", version = "1.0.0")
5858
bazel_dep(name = "googleapis-grpc-cc", version = "1.0.0")

google/cloud/bigtable/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ cc_library(
6363
] + select({
6464
":metrics_enabled": [
6565
"//:opentelemetry",
66-
"@io_opentelemetry_cpp//api",
67-
"@io_opentelemetry_cpp//sdk/src/metrics",
66+
"@opentelemetry-cpp//api",
67+
"@opentelemetry-cpp//sdk/src/metrics",
6868
],
6969
"//conditions:default": [],
7070
}),

google/cloud/licensemanager/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ licenses(["notice"]) # Apache 2.0
2121
service_dirs = ["v1/"]
2222

2323
googleapis_deps = [
24-
"@com_google_googleapis//google/cloud/licensemanager/v1:licensemanager_cc_grpc",
24+
"@googleapis//google/cloud/licensemanager/v1:licensemanager_cc_grpc",
2525
]
2626

2727
cc_gapic_library(

google/cloud/spanner/integration_tests/BUILD.bazel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ licenses(["notice"]) # Apache 2.0
3333
"//google/cloud/spanner:spanner_client_testing_private",
3434
"//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private",
3535
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
36-
# "//protos:system_includes",
3736
"//protos/google/cloud/spanner/testing:singer_cc_proto",
3837
"@googletest//:gtest_main",
3938
],
@@ -60,8 +59,7 @@ VARIATIONS = {
6059
"//google/cloud/spanner:spanner_client_testing_private",
6160
"//google/cloud/testing_util:google_cloud_cpp_testing_grpc_private",
6261
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
63-
"//protos:system_includes",
6462
"//protos/google/cloud/spanner/testing:singer_cc_proto",
65-
"@com_google_googletest//:gtest_main",
63+
"@googletest//:gtest_main",
6664
],
6765
) for test in spanner_client_session_mode_sensitive_integration_tests for v_label, v_env in VARIATIONS.items()]

0 commit comments

Comments
 (0)