From 805665c8050b329e123d9cfdf00247f52fbb53c3 Mon Sep 17 00:00:00 2001 From: Kuat Yessenov Date: Fri, 11 Dec 2020 10:14:09 -0800 Subject: [PATCH] resolve rules_go conflict Signed-off-by: Kuat Yessenov --- bazel/api_build_system.bzl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl index 5a41c73..be06206 100644 --- a/bazel/api_build_system.bzl +++ b/bazel/api_build_system.bzl @@ -134,15 +134,15 @@ def udpa_proto_package(srcs = [], deps = [], has_services = False, visibility = proto = name, visibility = ["//visibility:public"], deps = [_go_proto_mapping(dep) for dep in deps] + [ - "@com_github_golang_protobuf//ptypes:go_default_library", - "@com_github_golang_protobuf//ptypes/any:go_default_library", - "@com_github_golang_protobuf//ptypes/duration:go_default_library", - "@com_github_golang_protobuf//ptypes/struct:go_default_library", - "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", - "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", "@com_envoyproxy_protoc_gen_validate//validate:go_default_library", - "@com_google_googleapis//google/api:annotations_go_proto", - "@com_google_googleapis//google/rpc:status_go_proto", + "@com_github_golang_protobuf//ptypes:go_default_library_gen", + "@go_googleapis//google/api:annotations_go_proto", + "@go_googleapis//google/rpc:status_go_proto", + "@io_bazel_rules_go//proto/wkt:any_go_proto", + "@io_bazel_rules_go//proto/wkt:duration_go_proto", + "@io_bazel_rules_go//proto/wkt:struct_go_proto", + "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", + "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", ], )