Skip to content

gRPC 1.12.0 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2018
Merged

gRPC 1.12.0 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa06ad
gRPC 1.12.0
rmichela Jun 3, 2018
65e6a2b
Guava 20
rmichela Jun 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreFutures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(...);
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down