Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bazel: @com_github_golang_protobuf version consistency. #81

Merged
merged 1 commit into from
Jun 21, 2018
Merged

bazel: @com_github_golang_protobuf version consistency. #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bazel/go_proto_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion gogoproto/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
8 changes: 4 additions & 4 deletions module/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
6 changes: 3 additions & 3 deletions templates/cc/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
6 changes: 3 additions & 3 deletions templates/go/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
6 changes: 3 additions & 3 deletions templates/gogo/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
6 changes: 3 additions & 3 deletions templates/goshared/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion templates/shared/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
12 changes: 6 additions & 6 deletions tests/harness/executor/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand Down
4 changes: 2 additions & 2 deletions tests/harness/go/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
4 changes: 2 additions & 2 deletions tests/harness/go/main/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
8 changes: 4 additions & 4 deletions tests/kitchensink/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down