Update grpc-java to 1.20.0

Also, update the "pinned" version of bazel-deps so it can be built with Bazel 0.24, and update the instructions too, along with a workaround for a problem I encountered. Remove the apparently-now-unused resolverCache option, since bazel-deps uses ~/.cache/coursier regardless. Fixes #2. Change-Id: I33e4fefb26cec53267b0ff9f2f83467c1fc81e29 GitOrigin-RevId: 419cba1
googlecloudrobotics · Apr 12, 2019 · 82997d2 · 82997d2
1 parent be4b976
commit 82997d2
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 74 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -34,10 +34,10 @@ bind(
 # maven_dependencies.yaml.
 http_archive(
     name = "io_grpc_grpc_java",
-    sha256 = "83f6fff2bb94e344a966cc687e672cfadf7b026b9c936d7034b6367d06bedc5c",
-    strip_prefix = "grpc-java-1.17.2",
+    sha256 = "553d1bdbde3ff4035747c184486bae2f084c75c3c4cdf5ef31a6aa48bdccaf9b",
+    strip_prefix = "grpc-java-1.20.0",
     urls = [
-        "https://github.com/grpc/grpc-java/archive/v1.17.2.tar.gz",
+        "https://github.com/grpc/grpc-java/archive/v1.20.0.tar.gz",
     ],
 )
 
@@ -54,7 +54,6 @@ grpc_java_repositories(
     omit_com_google_guava = True,
     omit_com_google_j2objc_j2objc_annotations = True,
     omit_com_google_protobuf = True,
-    omit_com_google_protobuf_javalite = True,
     omit_com_google_protobuf_nano_protobuf_javanano = True,
     omit_com_google_truth_truth = True,
     omit_com_squareup_okhttp = True,
@@ -77,19 +76,6 @@ grpc_java_repositories(
     omit_org_codehaus_mojo_animal_sniffer_annotations = True,
 )
 
-# Ensure that the protobuf_javalite version is new enough for recent Bazel
-# versions.
-# TODO(rodrigoq): remove this and omit_com_google_protobuf_javalite above,
-# after https://github.com/grpc/grpc-java/pull/5212 is merged.
-http_archive(
-    name = "com_google_protobuf_javalite",
-    sha256 = "97b07327b491924fc5173fe1adc2bb504751b0f13990b70b1b5da16eddb47c8d",
-    strip_prefix = "protobuf-384989534b2246d413dbcd750744faab2607b516",
-    urls = [
-        "https://github.com/google/protobuf/archive/384989534b2246d413dbcd750744faab2607b516.tar.gz",
-    ],
-)
-
 load(
     "@io_bazel_rules_docker//repositories:repositories.bzl",
     container_repositories = "repositories",

diff --git a/src/java/com/cloudrobotics/framework/grpc/AuthenticationContextClientInterceptor.java b/src/java/com/cloudrobotics/framework/grpc/AuthenticationContextClientInterceptor.java
@@ -15,7 +15,6 @@
 package com.cloudrobotics.framework.grpc;
 
 import com.google.common.flogger.FluentLogger;
-import io.grpc.Attributes;
 import io.grpc.CallCredentials;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
@@ -39,10 +38,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
             new CallCredentials() {
               @Override
               public void applyRequestMetadata(
-                  MethodDescriptor<?, ?> methodDescriptor,
-                  Attributes attributes,
-                  Executor executor,
-                  MetadataApplier metadataApplier) {
+                  RequestInfo requestInfo, Executor executor, MetadataApplier metadataApplier) {
                 executor.execute(
                     () -> {
                       try {

diff --git a/third_party/java/com/google/android/BUILD b/third_party/java/com/google/android/BUILD
@@ -0,0 +1,13 @@
+# Do not edit. Generated by: https://github.com/johnynek/bazel-deps
+licenses(["notice"])
+java_library(
+    name = "annotations",
+    exports = [
+        "//external:jar/com/google/android/annotations"
+    ],
+    visibility = [
+        "//third_party/java:__subpackages__"
+    ]
+)
+
+
diff --git a/third_party/java/com/google/protobuf/BUILD b/third_party/java/com/google/protobuf/BUILD
@@ -17,6 +17,7 @@ java_library(
     exports = [
         "//external:jar/com/google/protobuf/protobuf_java_util",
         "//third_party/java/com/google/code/gson:gson",
+        "//third_party/java/com/google/errorprone:error_prone_annotations",
         "//third_party/java/com/google/guava:guava",
         ":protobuf_java"
     ],

diff --git a/third_party/java/io/grpc/BUILD b/third_party/java/io/grpc/BUILD
@@ -16,6 +16,7 @@ java_library(
     name = "grpc_core",
     exports = [
         "//external:jar/io/grpc/grpc_core",
+        "//third_party/java/com/google/android:annotations",
         "//third_party/java/com/google/code/findbugs:jsr305",
         "//third_party/java/com/google/code/gson:gson",
         "//third_party/java/com/google/errorprone:error_prone_annotations",

diff --git a/third_party/java/io/netty/BUILD b/third_party/java/io/netty/BUILD
@@ -17,6 +17,8 @@ java_library(
     name = "netty_codec",
     exports = [
         "//external:jar/io/netty/netty_codec",
+        ":netty_buffer",
+        ":netty_common",
         ":netty_transport"
     ],
     visibility = [
@@ -30,7 +32,11 @@ java_library(
     name = "netty_codec_http",
     exports = [
         "//external:jar/io/netty/netty_codec_http",
-        ":netty_codec"
+        ":netty_buffer",
+        ":netty_codec",
+        ":netty_common",
+        ":netty_handler",
+        ":netty_transport"
     ],
     visibility = [
         "//third_party/java:__subpackages__"
@@ -43,8 +49,12 @@ java_library(
     name = "netty_codec_http2",
     exports = [
         "//external:jar/io/netty/netty_codec_http2",
+        ":netty_buffer",
+        ":netty_codec",
         ":netty_codec_http",
-        ":netty_handler"
+        ":netty_common",
+        ":netty_handler",
+        ":netty_transport"
     ],
     visibility = [
         "//third_party/java:__subpackages__"
@@ -57,7 +67,10 @@ java_library(
     name = "netty_codec_socks",
     exports = [
         "//external:jar/io/netty/netty_codec_socks",
-        ":netty_codec"
+        ":netty_buffer",
+        ":netty_codec",
+        ":netty_common",
+        ":netty_transport"
     ],
     visibility = [
         "//third_party/java:__subpackages__"
@@ -84,6 +97,7 @@ java_library(
         "//external:jar/io/netty/netty_handler",
         ":netty_buffer",
         ":netty_codec",
+        ":netty_common",
         ":netty_transport"
     ],
     visibility = [
@@ -97,8 +111,11 @@ java_library(
     name = "netty_handler_proxy",
     exports = [
         "//external:jar/io/netty/netty_handler_proxy",
+        ":netty_buffer",
+        ":netty_codec",
         ":netty_codec_http",
         ":netty_codec_socks",
+        ":netty_common",
         ":netty_transport"
     ],
     visibility = [
@@ -126,6 +143,7 @@ java_library(
     exports = [
         "//external:jar/io/netty/netty_transport",
         ":netty_buffer",
+        ":netty_common",
         ":netty_resolver"
     ],
     visibility = [