diff --git a/WORKSPACE b/WORKSPACE index 7ef7349e..c7a31406 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -94,8 +94,31 @@ remote_apis_go_deps() # Needed for the googleapis protos. http_archive( name = "googleapis", - build_file = "BUILD.googleapis", - sha256 = "7b6ea252f0b8fb5cd722f45feb83e115b689909bbb6a393a873b6cbad4ceae1d", - strip_prefix = "googleapis-143084a2624b6591ee1f9d23e7f5241856642f4d", - urls = ["https://github.com/googleapis/googleapis/archive/143084a2624b6591ee1f9d23e7f5241856642f4d.zip"], + sha256 = "9d1a930e767c93c825398b8f8692eca3fe353b9aaadedfbcf1fca2282c85df88", + strip_prefix = "googleapis-64926d52febbf298cb82a8f472ade4a3969ba922", + urls = [ + "https://github.com/googleapis/googleapis/archive/64926d52febbf298cb82a8f472ade4a3969ba922.zip", + ], +) + +load("@googleapis//:repository_rules.bzl", "switched_rules_by_language") + +switched_rules_by_language( + name = "com_google_googleapis_imports", + cc = True, + java = True, + go = True, +) + +http_archive( + name = "rules_gapic", + sha256 = "913d88485702c6605ff481678a63cfd710877252a74ff9181bf0452515039625", + strip_prefix = "rules_gapic-0.28.1", + urls = [ + "https://github.com/googleapis/rules_gapic/archive/v0.28.1.tar.gz", + ], ) + +load("@rules_gapic//:repositories.bzl", "rules_gapic_repositories") + +rules_gapic_repositories() diff --git a/build/bazel/remote/asset/v1/BUILD b/build/bazel/remote/asset/v1/BUILD index a09bea40..f360b4fe 100644 --- a/build/bazel/remote/asset/v1/BUILD +++ b/build/bazel/remote/asset/v1/BUILD @@ -11,9 +11,9 @@ proto_library( "//build/bazel/remote/execution/v2:remote_execution_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:timestamp_proto", - "@googleapis//:google_api_annotations_proto", - "@googleapis//:google_api_http_proto", - "@googleapis//:google_rpc_status_proto", + "@googleapis//google/api:annotations_proto", + "@googleapis//google/api:http_proto", + "@googleapis//google/rpc:status_proto", ], ) diff --git a/build/bazel/remote/asset/v1/go/BUILD b/build/bazel/remote/asset/v1/go/BUILD index 076422ce..fd097bf4 100644 --- a/build/bazel/remote/asset/v1/go/BUILD +++ b/build/bazel/remote/asset/v1/go/BUILD @@ -10,8 +10,8 @@ go_proto_library( proto = "//build/bazel/remote/asset/v1:remote_asset_proto", deps = [ "//build/bazel/remote/execution/v2:remote_execution_go_proto", - "@go_googleapis//google/api:annotations_go_proto", - "@go_googleapis//google/rpc:status_go_proto", + "@googleapis//google/api:annotations_go_proto", + "@googleapis//google/rpc:status_go_proto", ], ) diff --git a/build/bazel/remote/execution/v2/BUILD b/build/bazel/remote/execution/v2/BUILD index 01f415be..e8edcf09 100644 --- a/build/bazel/remote/execution/v2/BUILD +++ b/build/bazel/remote/execution/v2/BUILD @@ -13,10 +13,10 @@ proto_library( "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:timestamp_proto", "@com_google_protobuf//:wrappers_proto", - "@googleapis//:google_api_annotations_proto", - "@googleapis//:google_api_http_proto", - "@googleapis//:google_longrunning_operations_proto", - "@googleapis//:google_rpc_status_proto", + "@googleapis//google/api:annotations_proto", + "@googleapis//google/api:http_proto", + "@googleapis//google/longrunning:operations_proto", + "@googleapis//google/rpc:status_proto", ], ) diff --git a/external/BUILD.googleapis b/external/BUILD.googleapis deleted file mode 100644 index 5225788f..00000000 --- a/external/BUILD.googleapis +++ /dev/null @@ -1,78 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load("@rules_proto//proto:defs.bzl", "proto_library") -load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") - -licenses(["notice"]) - -proto_library( - name = "google_api_annotations_proto", - srcs = ["google/api/annotations.proto"], - deps = [ - ":google_api_http_proto", - "@com_google_protobuf//:descriptor_proto", - ], -) - -cc_grpc_library( - name = "google_api_annotations_cc_proto", - srcs = ["google/api/annotations.proto"], - deps = [":google_api_http_cc_proto"], - proto_only = False, - well_known_protos = True, - use_external = False, -) - -proto_library( - name = "google_api_http_proto", - srcs = ["google/api/http.proto"], -) - -cc_grpc_library( - name = "google_api_http_cc_proto", - srcs = ["google/api/http.proto"], - deps = [], - proto_only = False, - well_known_protos = True, - use_external = False, -) - -proto_library( - name = "google_longrunning_operations_proto", - srcs = ["google/longrunning/operations.proto"], - deps = [ - ":google_api_annotations_proto", - ":google_api_http_proto", - ":google_rpc_status_proto", - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:empty_proto", - ], -) - -cc_grpc_library( - name = "google_longrunning_operations_cc_proto", - srcs = ["google/longrunning/operations.proto"], - deps = [ - ":google_api_annotations_cc_proto", - ":google_api_http_cc_proto", - ":google_rpc_status_cc_proto", - ], - proto_only = False, - well_known_protos = True, - use_external = False, -) - -proto_library( - name = "google_rpc_status_proto", - srcs = ["google/rpc/status.proto"], - deps = ["@com_google_protobuf//:any_proto"], -) - -cc_grpc_library( - name = "google_rpc_status_cc_proto", - srcs = ["google/rpc/status.proto"], - deps = [], - proto_only = False, - well_known_protos = True, - use_external = False, -)