diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index d9e063f5b1d..2c076b03885 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.7.1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.2-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.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-testing:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-auth:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-testing:1.22.2-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 ce6ac7a344b..034a6d7e208 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' group = "io.grpc" -version = "1.22.1" // CURRENT_GRPC_VERSION +version = "1.22.2-SNAPSHOT" // CURRENT_GRPC_VERSION description = 'gRPC: Android' buildscript { @@ -47,9 +47,9 @@ dependencies { errorprone 'com.google.errorprone:error_prone_core:2.3.3' errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1' - implementation 'io.grpc:grpc-core:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-core:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION - testImplementation 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION testImplementation 'junit:junit:4.12' testImplementation 'org.robolectric:robolectric:3.7.1' testImplementation 'com.google.truth:truth:0.45' diff --git a/build.gradle b/build.gradle index a1b5a43be8c..387573a9472 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ subprojects { } group = "io.grpc" - version = "1.22.1" // CURRENT_GRPC_VERSION + version = "1.22.2-SNAPSHOT" // CURRENT_GRPC_VERSION sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/compiler/src/test/golden/TestDeprecatedService.java.txt b/compiler/src/test/golden/TestDeprecatedService.java.txt index ce11c9120d9..82b34223287 100644 --- a/compiler/src/test/golden/TestDeprecatedService.java.txt +++ b/compiler/src/test/golden/TestDeprecatedService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.22.1)", + value = "by gRPC proto compiler (version 1.22.2-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @java.lang.Deprecated public final class TestDeprecatedServiceGrpc { diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt index c8b1c698f6b..2a76ea7c414 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.22.1)", + value = "by gRPC proto compiler (version 1.22.2-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") public final class TestServiceGrpc { diff --git a/compiler/src/testLite/golden/TestDeprecatedService.java.txt b/compiler/src/testLite/golden/TestDeprecatedService.java.txt index 277bd3a6e1e..494e92a7a0a 100644 --- a/compiler/src/testLite/golden/TestDeprecatedService.java.txt +++ b/compiler/src/testLite/golden/TestDeprecatedService.java.txt @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.22.1)", + value = "by gRPC proto compiler (version 1.22.2-SNAPSHOT)", comments = "Source: grpc/testing/compiler/test.proto") @java.lang.Deprecated public final class TestDeprecatedServiceGrpc { diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt index a99f43aa1ed..471a0e5c61b 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.22.1)", + value = "by gRPC proto compiler (version 1.22.2-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 f54b947cb35..7192074e020 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -202,7 +202,7 @@ public byte[] parseAsciiString(byte[] serialized) { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = "1.22.1"; // CURRENT_GRPC_VERSION + private static final String IMPLEMENTATION_VERSION = "1.22.2-SNAPSHOT"; // CURRENT_GRPC_VERSION /** * The default timeout in nanos for a keepalive ping request. diff --git a/cronet/build.gradle b/cronet/build.gradle index ea2985fd8dd..05cc41c2a10 100644 --- a/cronet/build.gradle +++ b/cronet/build.gradle @@ -39,8 +39,8 @@ android { } dependencies { - implementation 'io.grpc:grpc-core:1.22.1' // CURRENT_GRPC_VERSION - testImplementation 'io.grpc:grpc-testing:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-core:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.22.2-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 190b5a72efb..ddfcd1153df 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.22.1' // CURRENT_GRPC_VERSION -compile 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION +compile 'io.grpc:grpc-android:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION +compile 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // 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 344e7a1a11e..92c1156c9d3 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.22.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -49,12 +49,12 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' testImplementation 'junit:junit:4.12' testImplementation 'com.google.truth:truth:0.45' - testImplementation 'io.grpc:grpc-testing:1.22.1' // CURRENT_GRPC_VERSION + testImplementation 'io.grpc:grpc-testing:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 1ab92bc7090..c44575a4f14 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.7.1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -48,8 +48,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index 13550e75d03..a73ccb693a8 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.7.1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -47,8 +47,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.0.2' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle index 97358935059..75b5ad646a6 100644 --- a/examples/android/strictmode/app/build.gradle +++ b/examples/android/strictmode/app/build.gradle @@ -30,7 +30,7 @@ protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.7.0' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -48,8 +48,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index a6f90a4b02e..9304e4f5f83 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = 1.7 // 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.22.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.7.1' def protocVersion = protobufVersion diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 3595c82c2bf..640917e2c5d 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // 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.22.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.7.1' dependencies { diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index bd8e6ffb40e..8174bbfe65d 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // 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.22.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION def protobufVersion = '3.7.1' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index 286021b9d94..0a7ab7a1bf7 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -6,13 +6,13 @@ jar - 1.22.1 + 1.22.2-SNAPSHOT example-gauth https://github.com/grpc/grpc-java UTF-8 - 1.22.1 + 1.22.2-SNAPSHOT 3.7.1 1.7 diff --git a/examples/example-kotlin/android/helloworld/app/build.gradle b/examples/example-kotlin/android/helloworld/app/build.gradle index c4e197e0b2f..3f52565825c 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.7.1' } plugins { javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } - grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.1' // CURRENT_GRPC_VERSION + grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -72,9 +72,9 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // You need to build grpc-java to obtain these libraries below. - implementation 'io.grpc:grpc-okhttp:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-protobuf-lite:1.22.1' // CURRENT_GRPC_VERSION - implementation 'io.grpc:grpc-stub:1.22.1' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-okhttp:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-protobuf-lite:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION + implementation 'io.grpc:grpc-stub:1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION } repositories { mavenCentral() } diff --git a/examples/example-kotlin/build.gradle b/examples/example-kotlin/build.gradle index 45690f2fc03..0830db6e06b 100644 --- a/examples/example-kotlin/build.gradle +++ b/examples/example-kotlin/build.gradle @@ -25,7 +25,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.22.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { def kotlinVerion = plugins.findPlugin("org.jetbrains.kotlin.jvm").kotlinPluginVersion diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index b0190190485..43de8597edc 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -22,7 +22,7 @@ targetCompatibility = 1.7 // 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.22.1' // CURRENT_GRPC_VERSION +def grpcVersion = '1.22.2-SNAPSHOT' // CURRENT_GRPC_VERSION def nettyTcNativeVersion = '2.0.25.Final' def protocVersion = '3.7.1' diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 3ba944d8b75..517eed7737e 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -6,13 +6,13 @@ jar - 1.22.1 + 1.22.2-SNAPSHOT example-tls https://github.com/grpc/grpc-java UTF-8 - 1.22.1 + 1.22.2-SNAPSHOT 3.7.1 2.0.25.Final diff --git a/examples/pom.xml b/examples/pom.xml index f9ac87d0486..991b73d0311 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,13 +6,13 @@ jar - 1.22.1 + 1.22.2-SNAPSHOT examples https://github.com/grpc/grpc-java UTF-8 - 1.22.1 + 1.22.2-SNAPSHOT 3.7.1 3.7.1