From e86b282e6fb72e6c508937f396c4e3b50cb9ad96 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 25 Mar 2019 01:00:07 -0700 Subject: [PATCH] Update protobuf to the latest release (3.7.0) [Copybara import of https://github.com/bazelbuild/rules_cc/pull/8] Because of https://github.com/protocolbuffers/protobuf/issues/5918 we cannot use protobuf_deps() just yet. At least we can use the zlib.BUILD file from their examples. Fixes https://github.com/bazelbuild/rules_cc/issues/6 Merge 9bb624f3c8680ae9c9bb1131d1a3a9e0dde8a83f into 2312d7213425d868a54983f963c3e3d80b262558 PiperOrigin-RevId: 240091300 --- WORKSPACE | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index f6c948f..218b0b2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -18,11 +18,11 @@ bind( http_archive( name = "com_google_protobuf", - sha256 = "2244b0308846bb22b4ff0bcc675e99290ff9f1115553ae9671eba1030af31bc0", - strip_prefix = "protobuf-3.6.1.2", + sha256 = "3e933375ecc58d01e52705479b82f155aea2d02cc55d833f8773213e74f88363", + strip_prefix = "protobuf-3.7.0", urls = [ - "https://mirror.bazel.build/github.com/google/protobuf/archive/v3.6.1.2.tar.gz", - "https://github.com/google/protobuf/archive/v3.6.1.2.tar.gz", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/protobuf-all-3.7.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.7.0/protobuf-all-3.7.0.tar.gz", ], ) @@ -53,6 +53,20 @@ http_archive( ], ) +# TODO(https://github.com/protocolbuffers/protobuf/issues/5918: Remove when protobuf releases protobuf_deps.bzl) +http_archive( + name = "net_zlib", + build_file = "@com_google_protobuf//examples:third_party/zlib.BUILD", + sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1", + strip_prefix = "zlib-1.2.11", + urls = ["https://zlib.net/zlib-1.2.11.tar.gz"], +) + +bind( + name = "zlib", + actual = "@net_zlib//:zlib" +) + # Go rules and proto support http_archive( name = "io_bazel_rules_go",