From baa06ad6a96b035d7ce5c19e1e37e46777aef110 Mon Sep 17 00:00:00 2001
From: Ryan Michela <rmichela@salesforce.com>
Date: Sun, 3 Jun 2018 12:05:08 -0700
Subject: [PATCH 1/2] gRPC 1.12.0

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 412e47e8..7b6edd2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,7 @@
         <mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>
 
         <!-- Dependency Versions -->
-        <!-- Keep grpc.version in sync with srpc-grpc/java/pom.xml and srpc-grpc-dependencies/pom.xml -->
-        <grpc.version>1.10.0</grpc.version>
+        <grpc.version>1.12.0</grpc.version>
         <protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
         <slf4j.version>1.7.21</slf4j.version>
         <gson.version>2.7</gson.version> <!-- Same version as grpc-proto -->

From 65e6a2bf351641b78e6736906808c83babb1b7a4 Mon Sep 17 00:00:00 2001
From: Ryan Michela <rmichela@salesforce.com>
Date: Sun, 3 Jun 2018 12:44:45 -0700
Subject: [PATCH 2/2] Guava 20

---
 .../main/java/com/salesforce/grpc/contrib/MoreFutures.java    | 4 ++++
 .../src/main/java/com/salesforce/grpc/contrib/Statuses.java   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreFutures.java b/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreFutures.java
index bbc67a63..222ee7b9 100644
--- a/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreFutures.java
+++ b/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreFutures.java
@@ -111,11 +111,13 @@ public static <V> void onFailure(@Nonnull final ListenableFuture<V> future,
      * <p>If you are looking for a method to determine whether a given {@code Future} is done, use the
      * instance method {@link Future#isDone()}.
      *
+     * @deprecated Use Guava {@code Futures.getDone()}
      * @throws ExecutionException if the {@code Future} failed with an exception
      * @throws CancellationException if the {@code Future} was cancelled
      * @throws IllegalStateException if the {@code Future} is not done
      * @since Guava 20.0
      */
+    @Deprecated
     public static <V> V getDone(Future<V> future) throws ExecutionException {
     /*
      * We throw IllegalStateException, since the call could succeed later. Perhaps we "should" throw
@@ -142,9 +144,11 @@ public static <V> V getDone(Future<V> future) throws ExecutionException {
      * <p>If you are looking for a method to determine whether a given {@code Future} is done, use the instance method
      * {@link Future#isDone()}.
      *
+     * @deprecated Use Guava {@code Futures.getDoneUnchecked()}
      * @throws UncheckedExecutionException if the {@code Future} failed with an exception
      * @throws IllegalStateException if the {@code Future} is not done
      */
+    @Deprecated
     public static <V> V getDoneUnchecked(Future<V> future) {
     /*
      * We throw IllegalStateException, since the call could succeed later. Perhaps we "should" throw
diff --git a/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java b/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
index fc40f92b..45c4df2c 100644
--- a/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
+++ b/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
@@ -25,7 +25,7 @@
  *
  * <p>For example:
  * <pre>
- *     import static com.salesforce.grpc.contrib.Statuses;
+ *     import static com.salesforce.grpc.contrib.Statuses.*;
  *
  *     try {
  *         stub.someServiceOperation(...);