From 4335445d9820b89d409c6e15b55d16d69e19c9d9 Mon Sep 17 00:00:00 2001 From: zpencer Date: Wed, 18 Jul 2018 10:48:04 -0700 Subject: [PATCH] Start 1.15.0 development cycle (#4650) --- android-interop-testing/app/build.gradle | 12 ++++++------ android/build.gradle | 6 +++--- build.gradle | 2 +- compiler/src/test/golden/TestService.java.txt | 2 +- compiler/src/testLite/golden/TestService.java.txt | 2 +- compiler/src/testNano/golden/TestService.java.txt | 2 +- core/src/main/java/io/grpc/internal/GrpcUtil.java | 2 +- cronet/build.gradle | 4 ++-- documentation/android-channel-builder.md | 4 ++-- examples/android/clientcache/app/build.gradle | 10 +++++----- examples/android/helloworld/app/build.gradle | 8 ++++---- examples/android/routeguide/app/build.gradle | 8 ++++---- examples/build.gradle | 2 +- .../android/helloworld/app/build.gradle | 8 ++++---- examples/example-kotlin/build.gradle | 2 +- examples/pom.xml | 4 ++-- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index 0b0a6611d7..ac9e222e99 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -42,7 +42,7 @@ protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -71,11 +71,11 @@ dependencies { implementation 'junit:junit:4.12' // You need to build grpc-java to obtain the grpc libraries below. - implementation 'io.grpc:grpc-auth:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-okhttp:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-testing:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-auth:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-testing:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION // workaround for https://github.com/google/protobuf/issues/1889 protobuf 'com.google.protobuf:protobuf-java:3.0.2' diff --git a/android/build.gradle b/android/build.gradle index aff2cf2a13..47dbb4536b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' group = "io.grpc" -version = "1.14.0-SNAPSHOT" // CURRENT_GRPC_VERSION +version = "1.15.0-SNAPSHOT" // CURRENT_GRPC_VERSION description = 'gRPC: Android' buildscript { @@ -40,9 +40,9 @@ repositories { } dependencies { - implementation 'io.grpc:grpc-core:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-core:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION - testImplementation 'io.grpc:grpc-okhttp:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-okhttp:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION testImplementation 'junit:junit:4.12' testImplementation 'org.robolectric:robolectric:3.7.1' testImplementation 'com.google.truth:truth:0.39' diff --git a/build.gradle b/build.gradle index 4c25986f29..5a01e6e1a9 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ subprojects { idea.module.inheritOutputDirs = true group = "io.grpc" - version = "1.14.0-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.15.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 274de93488..9216e7bfe3 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.14.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.15.0-SNAPSHOT)", comments = "Source: grpc/testing/compiler/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 fde613a347..1f2fd16b40 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.14.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.15.0-SNAPSHOT)", comments = "Source: grpc/testing/compiler/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 7809add4ca..fe5720455d 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.14.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.15.0-SNAPSHOT)", comments = "Source: grpc/testing/compiler/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 4b50c1d670..1bd7aa6484 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -199,7 +199,7 @@ public final class GrpcUtil { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.14.0-SNAPSHOT"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.15.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 14210ea9e7..7bb376ac2e 100644 --- a/cronet/build.gradle +++ b/cronet/build.gradle @@ -39,8 +39,8 @@ android { } dependencies { - implementation 'io.grpc:grpc-core:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - testImplementation 'io.grpc:grpc-testing:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-core:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation "org.chromium.net:cronet-embedded:66.3359.158" diff --git a/documentation/android-channel-builder.md b/documentation/android-channel-builder.md index 0dd9976173..ef4f4c91f9 100644 --- a/documentation/android-channel-builder.md +++ b/documentation/android-channel-builder.md @@ -36,8 +36,8 @@ In your `build.gradle` file, include a dependency on both `grpc-android` and `grpc-okhttp`: ``` -compile 'io.grpc:grpc-android:1.14.0' // CURRENT_GRPC_VERSION -compile 'io.grpc:grpc-okhttp:1.14.0' // CURRENT_GRPC_VERSION +compile 'io.grpc:grpc-android:1.15.0' // CURRENT_GRPC_VERSION +compile 'io.grpc:grpc-okhttp:1.15.0' // CURRENT_GRPC_VERSION ``` You will also need permission to access the device's network state in your diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle index bec1a6a5e9..076840d85f 100644 --- a/examples/android/clientcache/app/build.gradle +++ b/examples/android/clientcache/app/build.gradle @@ -31,7 +31,7 @@ protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.4.0' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -49,12 +49,12 @@ 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.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' testCompile 'junit:junit:4.12' testCompile 'com.google.truth:truth:0.36' - testCompile 'io.grpc:grpc-testing:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + testCompile 'io.grpc:grpc-testing:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index f46a397ab9..d232a97d3a 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -30,7 +30,7 @@ protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -48,8 +48,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.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.15.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 2e2465bdcf..df5ff83164 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -29,7 +29,7 @@ protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -47,8 +47,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.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index 1e0f81a78d..44ced1dee7 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.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION def nettyTcNativeVersion = '2.0.7.Final' def protobufVersion = '3.5.1' def protocVersion = '3.5.1-1' diff --git a/examples/example-kotlin/android/helloworld/app/build.gradle b/examples/example-kotlin/android/helloworld/app/build.gradle index 486ce36387..bbccc7af28 100644 --- a/examples/example-kotlin/android/helloworld/app/build.gradle +++ b/examples/example-kotlin/android/helloworld/app/build.gradle @@ -52,7 +52,7 @@ protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.5.1-1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -72,9 +72,9 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-okhttp:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION } repositories { mavenCentral() } diff --git a/examples/example-kotlin/build.gradle b/examples/example-kotlin/build.gradle index 17ceddf8b2..fd446d3c68 100644 --- a/examples/example-kotlin/build.gradle +++ b/examples/example-kotlin/build.gradle @@ -35,7 +35,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.14.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.15.0-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" diff --git a/examples/pom.xml b/examples/pom.xml index 480533b566..16becf9717 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,12 +6,12 @@ jar - 1.14.0-SNAPSHOT + 1.15.0-SNAPSHOT examples http://maven.apache.org UTF-8 - 1.14.0-SNAPSHOT + 1.15.0-SNAPSHOT 3.5.1 3.5.1-1 2.0.7.Final