bazel: @com_github_golang_protobuf version consistency. (#81)

* Bump Bazel dep for @com_github_golang_protobuf to 1.0 to match the Gopkg.toml used by the make build. * Use pure Bazel external dep for @com_github_golang_protobuf to avoid having a combination of Bazel dep and vendored files. Signed-off-by: Harvey Tuch <[email protected]>
bufbuild · Jun 21, 2018 · 345b6b4 · 345b6b4
1 parent 9f600c2
commit 345b6b4
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 33 deletions.
diff --git a/bazel/go_proto_library.bzl b/bazel/go_proto_library.bzl
@@ -374,7 +374,7 @@ def go_proto_repositories(shared = 1):
   go_repository(
       name = "com_github_golang_protobuf",
       importpath = "github.com/golang/protobuf",
-      commit = "5afd06f9d81a86d6e3bb7dc702d6bd148ea3ff23",
+      commit = "925541529c1fa6821df4e44ce2723319eb2be768",
   )
   if shared:
     # if using multiple *_proto_library, allows caller to skip this.

diff --git a/gogoproto/BUILD.bazel b/gogoproto/BUILD.bazel
@@ -20,5 +20,5 @@ go_proto_library(
     importpath = "github.com/lyft/protoc-gen-validate/gogoproto",
     proto = ":gogoproto_proto",
     visibility = ["//visibility:public"],
-    deps = ["//vendor/github.com/golang/protobuf/protoc-gen-go/descriptor:go_default_library"],
+    deps = ["@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library"],
 )
diff --git a/module/BUILD b/module/BUILD
@@ -11,10 +11,10 @@ go_library(
     deps = [
         "//templates:go_default_library",
         "//validate:go_default_library",
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/duration:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//ptypes:go_default_library",
+        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
         "//vendor/github.com/lyft/protoc-gen-star:go_default_library",
     ],
 )
diff --git a/templates/cc/BUILD.bazel b/templates/cc/BUILD.bazel
@@ -27,9 +27,9 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//templates/shared:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/duration:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
+        "@com_github_golang_protobuf//ptypes:go_default_library",
+        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
         "//vendor/github.com/lyft/protoc-gen-star:go_default_library",
     ],
 )
diff --git a/templates/go/BUILD.bazel b/templates/go/BUILD.bazel
@@ -14,9 +14,9 @@ go_library(
     deps = [
         "//templates/goshared:go_default_library",
         "//templates/shared:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/duration:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
+        "@com_github_golang_protobuf//ptypes:go_default_library",
+        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
         "//vendor/github.com/lyft/protoc-gen-star:go_default_library",
     ],
 )
diff --git a/templates/gogo/BUILD.bazel b/templates/gogo/BUILD.bazel
@@ -14,9 +14,9 @@ go_library(
     deps = [
         "//templates/goshared:go_default_library",
         "//templates/shared:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/duration:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
+        "@com_github_golang_protobuf//ptypes:go_default_library",
+        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
         "//vendor/github.com/lyft/protoc-gen-star:go_default_library",
     ],
 )

diff --git a/templates/goshared/BUILD.bazel b/templates/goshared/BUILD.bazel
@@ -26,9 +26,9 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//templates/shared:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/duration:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
+        "@com_github_golang_protobuf//ptypes:go_default_library",
+        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
         "//vendor/github.com/lyft/protoc-gen-star:go_default_library",
     ],
 )
diff --git a/templates/shared/BUILD.bazel b/templates/shared/BUILD.bazel
@@ -14,7 +14,7 @@ go_library(
     deps = [
         "//gogoproto:go_default_library",
         "//validate:go_default_library",
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
         "//vendor/github.com/lyft/protoc-gen-star:go_default_library",
     ],
 )
diff --git a/tests/harness/executor/BUILD b/tests/harness/executor/BUILD
@@ -14,12 +14,12 @@ go_library(
         "//tests/harness/cases:go",
         "//tests/harness/cases/other_package:go",
         "//tests/harness/go:go_default_library",
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/any:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/duration:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/wrappers:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
+        "@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/timestamp:go_default_library",
+        "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
         "//vendor/golang.org/x/net/context:go_default_library",
     ],
 )

diff --git a/tests/harness/go/BUILD b/tests/harness/go/BUILD
@@ -6,7 +6,7 @@ go_library(
     importpath = "github.com/lyft/protoc-gen-validate/tests/harness/go",
     visibility = ["//visibility:public"],
     deps = [
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/any:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//ptypes/any:go_default_library",
     ],
 )
diff --git a/tests/harness/go/main/BUILD b/tests/harness/go/main/BUILD
@@ -9,8 +9,8 @@ go_library(
         "//tests/harness/cases:go",
         "//tests/harness/cases/other_package:go",
         "//tests/harness/go:go_default_library",
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//ptypes:go_default_library",
     ],
 )
 

diff --git a/tests/kitchensink/BUILD b/tests/kitchensink/BUILD
@@ -66,10 +66,10 @@ go_proto_library(
     deps = [
         "//gogoproto:go_default_library",
         "//validate:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/any:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/duration:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/timestamp:go_default_library",
-        "//vendor/github.com/golang/protobuf/ptypes/wrappers: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/timestamp:go_default_library",
+        "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
     ],
 )