Update Grpc to 1.10.1 (#212)

* Update grpc to 1.10.1

- Remove grpc_repository.bzl.  This was previously used to eliminate
  grpc/grpc additional to submodules and c-ares issues, which is
  now improved in source repo.
- Add grpc_archive.bzl.  We still need to patch the generate_cc.bzl
  file (should probably just upstream this change there).
- Remove previous references to @com_google_grpc.
- Update boringssl.

Fixes #187

* Update to grpc v1.10.1

* Update major deps in README

* Preserve com_google_grpc alias to com_github_grpc_grpc

The grpc repository continues to not compile
correctly as an external repo (reflection++).
Still need the grpc_archive construct that replaces
out the generate_cc.bzl file

* Use bazel instead of bzl-io/bzl tool

* Try grpc tar.gz (for failing travis error)

Author: pcj

DEPENDENCIES.md

@@ -10,19 +10,18 @@ To update this list, `bazel build @org_pubref_rules_protobuf//:deps && cp bazel-
 | [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@protocol_compiler`** | `//external:protocol_compiler` (`@com_google_protobuf//:protoc`) |
 | [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@protobuf`** | `//external:protobuf` (`@com_google_protobuf//:protobuf`) |
 | [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@protobuf_clib`** | `//external:protobuf_clib` (`@com_google_protobuf//:protoc_lib`) |
+| [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@protobuf_headers`** | `//external:protobuf_headers` (`@com_google_protobuf//:protobuf_headers`) |
 
 ## C++
 
 | Rule | Workspace | Detail |
 | ---: | :--- | :--- |
-| [http_archive](https://docs.bazel.build/versions/master/be/workspace.html#http_archive) | **`@com_google_grpc_base`** | [sha256:d3794ca4ff7b](https://github.com/grpc/grpc/archive/ca87867579580928ca4c9fdf97051fa25bf1d386.zip) |
-| grpc_repository | **`@com_google_grpc`** |  |
-| [new_http_archive](https://docs.bazel.build/versions/master/be/workspace.html#new_http_archive) | **`@com_github_c_ares_c_ares`** | [sha256:ddce8def076a](https://github.com/c-ares/c-ares/archive/7691f773af79bf75a62d1863fd0f13ebf9dc51b1.zip) |
-| grpc_repository | **`@com_github_grpc_grpc`** |  |
-| [http_archive](https://docs.bazel.build/versions/master/be/workspace.html#http_archive) | **`@boringssl`** | [(no hash provided)](https://boringssl.googlesource.com/boringssl/+archive/74ffd81aa7ec3d0aa3d3d820dbeda934958ca81a.tar.gz) |
+| grpc_archive | **`@com_google_grpc`** |  |
+| [http_archive](https://docs.bazel.build/versions/master/be/workspace.html#http_archive) | **`@boringssl`** | [(no hash provided)](https://boringssl.googlesource.com/boringssl/+archive/886e7d75368e3f4fab3f4d0d3584e4abfc557755.tar.gz) |
 | [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@libssl`** | `//external:libssl` (`@boringssl//:ssl`) |
 | [new_http_archive](https://docs.bazel.build/versions/master/be/workspace.html#new_http_archive) | **`@com_github_madler_zlib`** | [sha256:1cce3828ec2b](https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.zip) |
-| [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@cares`** | `//external:cares` (`@com_google_grpc//third_party/cares:ares`) |
+| [new_http_archive](https://docs.bazel.build/versions/master/be/workspace.html#new_http_archive) | **`@com_github_cares_cares`** | [sha256:932bf7e593d4](https://github.com/c-ares/c-ares/archive/3be1924221e1326df520f8498d704a5c4c8d0cce.zip) |
+| [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@cares`** | `//external:cares` (`@com_github_cares_cares//:ares`) |
 | [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@zlib`** | `//external:zlib` (`@com_github_madler_zlib//:zlib`) |
 | [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@nanopb`** | `//external:nanopb` (`@com_google_grpc//third_party/nanopb`) |
 | [bind](https://docs.bazel.build/versions/master/be/workspace.html#bind) | **`@protoc_gen_grpc_cpp`** | `//external:protoc_gen_grpc_cpp` (`@com_google_grpc//:grpc_cpp_plugin`) |

README.md

@@ -21,7 +21,7 @@ the main bazel repository.  This is a moving target.  The main goals
 of this project are to:
 
 1. Provide `protoc`, the protocol buffer compiler
-   ([v3.4.0](https://github.com/google/protobuf/commit/2807436cd828a526c5c38dd235c0d0d9cdc67b1f)).
+   ([v3.5.1](https://github.com/google/protobuf/commit/1f8b9b202e9a4e467ff0b0f25facb1642727cdf5e69092038f15b37c75b99e45)).
 
 2. Provide the language-specific plugins.
 
@@ -38,15 +38,15 @@ of this project are to:
 
 | Language                     | Compile <sup>1</sup>  | Build <sup>2</sup> | gRPC <sup>3</sup> |
 | ---------------------------: | -----------: | --------: | -------- |
-| [C++](cpp)                   | [cc_proto_compile](cpp#cc_proto_compile) | [cc_proto_library](cpp#cc_proto_library) [v3.4.0](https://github.com/grpc/grpc/releases/tag/v1.6.1) | [v1.6.1](https://github.com/grpc/grpc/releases/tag/v1.6.1) |
+| [C++](cpp)                   | [cc_proto_compile](cpp#cc_proto_compile) | [cc_proto_library](cpp#cc_proto_library) [v3.5.1](https://github.com/google/protobuf/releases/tag/v3.5.1) | [v1.10.1](https://github.com/grpc/grpc/releases/tag/v1.10.1) |
 | [C#](csharp)                 | [csharp_proto_compile](csharp#csharp_proto_compile) | [csharp_proto_library](csharp#csharp_proto_library) | [1.0.0](https://www.nuget.org/packages/Grpc/) |
 | [Closure](closure)           | [closure_proto_compile](closure#closure_proto_compile) | [closure_proto_library](closure#closure_proto_library)          |  |
 | [Go](go)                     | [go_proto_compile](go#go_proto_compile) | [go_proto_library](go#go_proto_library) | [v1.6.0](https://github.com/grpc/grpc-go/releases/tag/v1.6.0) |
-| [Go (gogo)](gogo)            | [gogo_proto_compile](gogo#gogo_proto_compile) | [gogo_proto_library](gogo#gogo_proto_library) | [fb8a35](https://github.com/gogo/protobuf/commit/fb8a359905af6e2b6517cccda0ba25915322ee88) |
+| [Go (gogo)](gogo)            | [gogo_proto_compile](gogo#gogo_proto_compile) | [gogo_proto_library](gogo#gogo_proto_library) | [Nov 2017](https://github.com/gogo/protobuf/commit/616a82ed12d78d24d4839363e8f3c5d3f20627cf) |
 | [gRPC gateway](grpc_gateway) | [grpc_gateway_proto_compile](grpc_gateway#grpc_gateway_proto_compile)<br/>[grpc_gateway_swagger_compile](grpc_gateway#grpc_gateway_swagger_compile)   | [grpc_gateway_proto_library](grpc_gateway#grpc_gateway_proto_library)<br/>[grpc_gateway_binary](grpc_gateway#grpc_gateway_binary) | [v1.2.2+ (f2862b)](https://github.com/grpc-ecosystem/grpc-gateway/commit/f2862b476edcef83412c7af8687c9cd8e4097c0f) |
-| [Java](java)                 | [java_proto_compile](java#java_proto_compile) | [java_proto_library](java#java_proto_library) | [v1.7.0](https://github.com/grpc/grpc-java/releases/tag/v1.7.0) |
-| [Node](node)                 | [node_proto_compile](node#node_proto_compile) | [node_proto_library](node#node_proto_library)          | [1.6.0](https://www.npmjs.com/package/grpc) |
-| [Objective-C](objc) | [objc_proto_compile](objc#objc_proto_compile) | [objc_proto_library](objc#objc_proto_library) <sup>4</sup> | [v1.6.1](https://github.com/grpc/grpc/commit/f5600e99be0fdcada4b3039c0f656a305264884a) |
+| [Java](java)                 | [java_proto_compile](java#java_proto_compile) | [java_proto_library](java#java_proto_library) | [v1.9.0](https://github.com/grpc/grpc-java/releases/tag/v1.9.0) |
+| [Node](node)                 | [node_proto_compile](node#node_proto_compile) | [node_proto_library](node#node_proto_library)          | [1.10.1](https://www.npmjs.com/package/grpc) |
+| [Objective-C](objc) | [objc_proto_compile](objc#objc_proto_compile) | [objc_proto_library](objc#objc_proto_library) <sup>4</sup> | [v1.10.1](https://github.com/grpc/grpc/releases/v1.10.1) |
 | [Python](python)             | [py_proto_compile](python#py_proto_compile)         | [py_proto_library](python#py_proto_library)          | [v1.6.1](https://github.com/grpc/grpc/commit/f5600e99be0fdcada4b3039c0f656a305264884a) |
 | [Ruby](ruby)                 | [ruby_proto_compile](ruby#ruby_proto_compile)          |           | [v1.6.1](https://github.com/grpc/grpc/commit/f5600e99be0fdcada4b3039c0f656a305264884a) |
 | Custom [proto_language](protobuf#proto_language) | [proto_compile](protobuf#proto_compile) | |  |

cpp/BUILD

@@ -23,3 +23,4 @@ proto_language(
     ],
     supports_grpc = True,
 )
+

cpp/deps.bzl

@@ -1,43 +1,18 @@
-DEPS = {
+CARES_VERSION = "3be1924221e1326df520f8498d704a5c4c8d0cce" # Jun 16, 2017 (1.13.0)
 
-    # Grpc repo is required by multiple languages but we put it here.
-    # This is the source or "base" archive for the 'grpc_repository'
-    # rule, were we'll reconstruct a new repo by symlinking resources
-    # from here into 'com_google_grpc'.
-    "com_google_grpc_base": {
-        "rule": "http_archive",
-        "url": "https://github.com/grpc/grpc/archive/ca87867579580928ca4c9fdf97051fa25bf1d386.zip", # Sep 19, 2017 (PR#12571)
-        "sha256": "d3794ca4ff7b12635bd4972bb9478f1d11e478305490b96469eb3a47e50b1768",
-        "strip_prefix": "grpc-ca87867579580928ca4c9fdf97051fa25bf1d386",
-    },
+DEPS = {
 
     "com_google_grpc": {
-        "rule": "grpc_repository",
-        "base_workspace": "@com_google_grpc_base//:WORKSPACE",
+        "rule": "grpc_archive",
+        "url": "https://github.com/grpc/grpc/archive/66b9770a8ad326c1ee0dbedc5a8f32a52a604567.tar.gz", # 1.10.1
+        "sha256": "14c1d63217f829f3c23bf039a76c186d0886c5b5c64e7eced44764f0fc564e6a",
+        "strip_prefix": "grpc-66b9770a8ad326c1ee0dbedc5a8f32a52a604567",
     },
 
-    "com_github_c_ares_c_ares": {
-        "rule": "new_http_archive",
-        "url": "https://github.com/c-ares/c-ares/archive/7691f773af79bf75a62d1863fd0f13ebf9dc51b1.zip",
-        "sha256": "ddce8def076a0a8cfa3f56595e391cf9e13a39fd4a7882822ed98cafd4079862",
-        "strip_prefix": "c-ares-7691f773af79bf75a62d1863fd0f13ebf9dc51b1",
-        "build_file_content": "",
-    },
-
-    "com_github_grpc_grpc": {
-        "rule": "grpc_repository",
-    },
-
-    # Hooray! The boringssl team provides "master-with-bazel" and
-    # "chromium-stable-with-bazel" branches with the BUILD files ready
-    # to go.  To update, pick the newest-ish commit-id off that
-    # branch.
     "boringssl": {
         "rule": "http_archive",
         # master-with-bazel Fri Sep 01 15:09:13 2017 +0000
-        "url": "https://boringssl.googlesource.com/boringssl/+archive/74ffd81aa7ec3d0aa3d3d820dbeda934958ca81a.tar.gz",
-        # Shockingly, tar.gz from googlesource has a different sha256 each time.  WTF?
-        #"sha256": "7deda1bac8f10be6dca78b54b8b2886a215f6c62270afdd2ed43bc10920925c7",
+        "url": "https://boringssl.googlesource.com/boringssl/+archive/886e7d75368e3f4fab3f4d0d3584e4abfc557755.tar.gz",
     },
 
     # libssl is required for c++ grpc where it is expected in
@@ -56,12 +31,21 @@ DEPS = {
         "build_file": str(Label("//protobuf:build_file/com_github_madler_zlib.BUILD")),
     },
 
+    "com_github_cares_cares": {
+        "rule": "new_http_archive",
+        "url": "https://github.com/c-ares/c-ares/archive/%s.zip" % CARES_VERSION,
+        "sha256": "932bf7e593d4683fce44fd26920f27d4f0c229113338e4f6d351e35d4d7c7a39",
+        "strip_prefix": "c-ares-" + CARES_VERSION,
+        "build_file": str(Label("//protobuf:build_file/cares.BUILD")),
+    },
+    
     # grpc++ expects //external:cares
     "cares": {
         "rule": "bind",
-        "actual": "@com_google_grpc//third_party/cares:ares",
+        "actual": "@com_github_cares_cares//:ares",
     },
 
+    
     # grpc++ expects //external:zlib
     "zlib": {
         "rule": "bind",

cpp/generate_cc.modified.bzl renamed to cpp/generate_cc.bzl

@@ -0,0 +1,42 @@
+def _execute(rtx, cmds, print_result = False, keep_going = True):
+    result = rtx.execute(cmds)
+    if result.return_code:
+        if not keep_going:
+            fail("$ %s failed (%s)" % (" ".join(cmds), result.stderr))
+    if print_result:
+        print("$ %r\n%s" % (cmds, result.stdout))
+    return result
+
+
+# The grpc repository needs enough work that we need a custom repository
+# rule to set it up.
+def _grpc_archive_impl(rtx):
+
+    rtx.download_and_extract(
+        rtx.attr.url,
+        output = "",
+        sha256 = rtx.attr.sha256,
+        type = rtx.attr.type,
+        stripPrefix = rtx.attr.strip_prefix,
+    )
+
+    _execute(rtx, ["rm", "bazel/generate_cc.bzl"])
+    
+    rtx.symlink(rtx.path(rtx.attr.generate_cc_bzl), "bazel/generate_cc.bzl")
+    rtx.file("WORKSPACE", "workspace(name = 'com_google_grpc')")
+
+# Http archive that patches the grpc repository so that the reflection++ targets compile
+# as an external workspace.
+#
+grpc_archive = repository_rule(
+    implementation = _grpc_archive_impl,
+    attrs = {
+        "url": attr.string(),
+        "sha256": attr.string(),
+        "strip_prefix": attr.string(),
+        "type": attr.string(),
+        "generate_cc_bzl": attr.label(
+            default = Label("@org_pubref_rules_protobuf//cpp:generate_cc.bzl", relative_to_caller_repository=True)
+        ),
+    },
+)

cpp/grpc_archive.bzl

@@ -1,16 +1,15 @@
 load("//protobuf:rules.bzl", "proto_compile", "proto_repositories")
 load("//cpp:deps.bzl", "DEPS")
-load("//cpp:grpc_repository.bzl", "grpc_repository")
+load("//cpp:grpc_archive.bzl", "grpc_archive")
 
 def cpp_proto_repositories(
     lang_deps = DEPS,
     lang_requires = [
-      "cares",
-      "com_google_googletest",
-      "com_google_grpc_base",
       "com_google_grpc",
-      "com_github_c_ares_c_ares",
+      "com_github_cares_cares",
+      "com_google_googletest",
       "com_github_madler_zlib",
+      "cares",
       "zlib",
       "nanopb",
       "boringssl",
@@ -24,8 +23,8 @@ def cpp_proto_repositories(
 
   for dep in rem:
     rule = dep.pop("rule")
-    if "grpc_repository" == rule:
-      grpc_repository(**dep)
+    if "grpc_archive" == rule:
+      grpc_archive(**dep)
     else:
       fail("Unknown loading rule %s for %s" % (rule, dep))