Skip to content

Commit

Permalink
Upgrade protobuf to 4.0.0-rc1, part 1/3
Browse files Browse the repository at this point in the history
This change includes the third_party changes neccessary to upgrade
protobuf to 4.0.0-rc1.

Note that the bump of protobuf's major version was neccessary because of
a breaking change in PHP which Bazel isn't affected by.

Working towards making Bazel compatible with bazelbuild#11694
  • Loading branch information
Yannic committed Jul 20, 2020
1 parent 4c9b72a commit 5ded2fa
Showing 1 changed file with 40 additions and 0 deletions.
40 changes: 40 additions & 0 deletions third_party/protobuf/4.0.0-rc1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
diff --git a/BUILD b/BUILD
index 224c8fce1..cde9d9d5e 100644
--- a/BUILD
+++ b/BUILD
@@ -50,7 +50,7 @@ GTEST_MAIN = select({
# ZLIB configuration
################################################################################

-ZLIB_DEPS = ["@zlib//:zlib"]
+ZLIB_DEPS = ["@io_bazel//third_party/zlib"]

################################################################################
# Protobuf Runtime Library
@@ -845,7 +845,7 @@ py_proto_library(
py_extra_srcs = glob(["python/**/__init__.py"]),
py_libs = [
":python_srcs",
- "@six//:six",
+ "@io_bazel//third_party/py/six",
],
srcs_version = "PY2AND3",
visibility = ["//visibility:public"],
diff --git a/java/util/BUILD b/java/util/BUILD
index cfdb28e2e..3705fdbe3 100644
--- a/java/util/BUILD
+++ b/java/util/BUILD
@@ -11,10 +11,10 @@ java_library(
],
visibility = ["//visibility:public"],
deps = [
- "//external:error_prone_annotations",
- "//external:gson",
- "//external:guava",
"//java/core",
"//java/lite",
+ "@io_bazel//third_party:error_prone_annotations",
+ "@io_bazel//third_party:guava",
+ "@io_bazel//third_party:gson",
],
)

0 comments on commit 5ded2fa

Please sign in to comment.