Skip to content

Commit

Permalink
Upgrade protobuf to 3.13.0, part 2/3
Browse files Browse the repository at this point in the history
This change does the actual upgrade of Protobuf. I'll send
a follow-up to remove the now-unused patch-file for `3.11.3`
when this has landed (and there is no risk of a rollback).

Working towards making Bazel compatible with bazelbuild#11694

Closes bazelbuild#12108.

PiperOrigin-RevId: 332196682
  • Loading branch information
Yannic authored and coeuvre committed Oct 22, 2020
1 parent 14f9b17 commit e887418
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ pkg_tar(
srcs = [
"@com_google_protobuf//:protobuf_java",
"@com_google_protobuf//:protobuf_java_util",
"@com_google_protobuf//:protobuf_javalite",
],
remap_paths = {
"..": "derived/jars",
Expand Down
30 changes: 15 additions & 15 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ http_archive(
patch_args = ["-p1"],
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
patches = ["//third_party/protobuf:3.11.3.patch"],
sha256 = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
strip_prefix = "protobuf-3.11.3",
patches = ["//third_party/protobuf:3.13.0.patch"],
sha256 = "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
strip_prefix = "protobuf-3.13.0",
urls = [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
],
)

Expand Down Expand Up @@ -172,7 +172,7 @@ distdir_tar(
# bazelbuild/rules_proto
"97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
# protocolbuffers/protobuf
"v3.11.3.tar.gz",
"v3.13.0.tar.gz",
# grpc/grpc
"v1.32.0.tar.gz",
# c-ares/c-ares
Expand Down Expand Up @@ -213,7 +213,7 @@ distdir_tar(
# bazelbuild/rules_proto
"97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
# protocolbuffers/protobuf
"v3.11.3.tar.gz": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
"v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
# grpc/grpc
"v1.32.0.tar.gz": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
# c-ares/c-ares
Expand Down Expand Up @@ -293,9 +293,9 @@ distdir_tar(
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
],
# protocolbuffers/protobuf
"v3.11.3.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"v3.13.0.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
],
# grpc/grpc
"v1.32.0.tar.gz": [
Expand Down Expand Up @@ -555,7 +555,7 @@ distdir_tar(
# bazelbuild/rules_proto
"97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
# protocolbuffers/protobuf
"v3.11.3.tar.gz",
"v3.13.0.tar.gz",
# grpc/grpc
"v1.32.0.tar.gz",
# c-ares/c-ares
Expand Down Expand Up @@ -589,7 +589,7 @@ distdir_tar(
# bazelbuild/rules_proto
"97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
# protocolbuffers/protobuf
"v3.11.3.tar.gz": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
"v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
# grpc/grpc
"v1.32.0.tar.gz": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a",
# c-ares/c-ares
Expand Down Expand Up @@ -639,9 +639,9 @@ distdir_tar(
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
],
# protocolbuffers/protobuf
"v3.11.3.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"v3.13.0.tar.gz": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
],
# grpc/grpc
"v1.32.0.tar.gz": [
Expand Down

0 comments on commit e887418

Please sign in to comment.