diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index 7a26317535..9a435ce86c 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -34,7 +34,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -62,10 +62,10 @@ dependencies { compile 'com.android.support:support-annotations:23.1.1' compile 'com.google.android.gms:play-services-base:7.3.0' // You need to build grpc-java to obtain the grpc libraries below. - compile 'io.grpc:grpc-protobuf-nano:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-okhttp:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-testing:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-nano:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-testing:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' compile 'junit:junit:4.12' diff --git a/build.gradle b/build.gradle index c5cdb83f19..9d03d3bd2a 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ subprojects { idea.module.inheritOutputDirs = true group = "io.grpc" - version = "1.10.0-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.11.0-SNAPSHOT" // CURRENT_GRPC_VERSION sourceCompatibility = 1.6 targetCompatibility = 1.6 diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index d9de41fa48..1171454089 100644 --- a/compiler/src/test/golden/TestService.java.txt +++ b/compiler/src/test/golden/TestService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.11.0-SNAPSHOT)", comments = "Source: test.proto") public final class TestServiceGrpc { diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index 6e0db0158c..5d337cfc61 100644 --- a/compiler/src/testLite/golden/TestService.java.txt +++ b/compiler/src/testLite/golden/TestService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.11.0-SNAPSHOT)", comments = "Source: test.proto") public final class TestServiceGrpc { diff --git a/compiler/src/testNano/golden/TestService.java.txt b/compiler/src/testNano/golden/TestService.java.txt index 5d5ddaefbb..f339cfdde7 100644 --- a/compiler/src/testNano/golden/TestService.java.txt +++ b/compiler/src/testNano/golden/TestService.java.txt @@ -23,7 +23,7 @@ import java.io.IOException; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.11.0-SNAPSHOT)", comments = "Source: test.proto") public final class TestServiceGrpc { diff --git a/core/src/main/java/io/grpc/internal/GrpcUtil.java b/core/src/main/java/io/grpc/internal/GrpcUtil.java index 994b8eb8af..414d994c55 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -194,7 +194,7 @@ public final class GrpcUtil { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.10.0-SNAPSHOT"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.11.0-SNAPSHOT"; // CURRENT_GRPC_VERSION /** * The default delay in nanos before we send a keepalive. diff --git a/cronet/build.gradle b/cronet/build.gradle index 9a3e43a9df..be06d2fc7d 100644 --- a/cronet/build.gradle +++ b/cronet/build.gradle @@ -48,8 +48,8 @@ android { } dependencies { - implementation 'io.grpc:grpc-core:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - testImplementation 'io.grpc:grpc-testing:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-core:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation files('libs/cronet_api.jar') implementation files('libs/cronet_impl_common_java.jar') diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 9a3ed0c3a8..c5981a77fc 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -37,7 +37,7 @@ protobuf { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -57,8 +57,8 @@ dependencies { compile 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-okhttp:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index 2392913990..d61508c614 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -36,7 +36,7 @@ protobuf { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -56,8 +56,8 @@ dependencies { compile 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-okhttp:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index 5bf7c5aaf8..e2c637932d 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -22,7 +22,7 @@ repositories { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. -def grpcVersion = '1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { compile "com.google.api.grpc:proto-google-common-protos:1.0.0" diff --git a/examples/pom.xml b/examples/pom.xml index 3ccfb92622..836bd07695 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,12 +6,12 @@ jar - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT examples http://maven.apache.org UTF-8 - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT