Skip to content

Commit

Permalink
Update protobuf dependency to 3.2.0
Browse files Browse the repository at this point in the history
Change-Id: I32f6b16955ecefc242af8d9261418452d698c9ff
PiperOrigin-RevId: 154812955
  • Loading branch information
buchgr authored and damienmg committed May 2, 2017
1 parent 9b3b2e9 commit 6e12e65
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
14 changes: 10 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ bind(
actual = "//third_party:guava",
)

# Used by //third_party/protobuf:protobuf_python
bind(
name = "six",
actual = "//third_party/py/six",
)

# For tools/cpp/test/...
load("//tools/cpp/test:docker_repository.bzl", "docker_repository")
docker_repository()
Expand All @@ -52,14 +58,14 @@ bind(name = "xcrunwrapper", actual = "@bazel_tools//tools/objc:xcrunwrapper")

new_local_repository(
name = "com_google_protobuf",
path = "./third_party/protobuf/3.0.0/",
build_file = "./third_party/protobuf/3.0.0/BUILD",
path = "./third_party/protobuf/3.2.0/",
build_file = "./third_party/protobuf/3.2.0/BUILD"
)

new_local_repository(
name = "com_google_protobuf_java",
path = "./third_party/protobuf/3.0.0/",
build_file = "./third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD",
path = "./third_party/protobuf/3.2.0/",
build_file = "./third_party/protobuf/3.2.0/com_google_protobuf_java.BUILD",
)

# OpenJDK distributions used to create a version of Bazel bundled with the OpenJDK.
Expand Down
2 changes: 2 additions & 0 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ if [ $DO_SRCS_TEST ]; then
| grep -v '^derived' \
| grep -Ev "${SRCS_EXCLUDES}" \
| grep -v '^tools/defaults/BUILD' \
#TODO(buchgr): Remove once protobuf update complete.
| grep -v 'third_party/protobuf/3.0.0/' \
| sort -u >"${OUTPUT_DIR}/srcs-find"

log "Diffing"
Expand Down
2 changes: 1 addition & 1 deletion src/main/protobuf/BUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"])

load("//tools/build_rules:genproto.bzl", "java_proto_library", "cc_grpc_library")
load("//third_party/protobuf/3.0.0:protobuf.bzl", "cc_proto_library", "py_proto_library")
load("//third_party/protobuf/3.2.0:protobuf.bzl", "cc_proto_library", "py_proto_library")

FILES = [
"build",
Expand Down

0 comments on commit 6e12e65

Please sign in to comment.