diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle
index 9de66fd1984..61752aef5fb 100644
--- a/android-interop-testing/app/build.gradle
+++ b/android-interop-testing/app/build.gradle
@@ -32,7 +32,7 @@ protobuf {
}
plugins {
grpc {
- artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ artifact = 'io.grpc:protoc-gen-grpc-java:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@@ -61,10 +61,10 @@ dependencies {
compile 'com.google.guava:guava:18.0'
compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below.
- compile 'io.grpc:grpc-protobuf-nano:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- compile 'io.grpc:grpc-okhttp:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- compile 'io.grpc:grpc-stub:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- compile 'io.grpc:grpc-testing:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-protobuf-nano:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-okhttp:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-stub:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-testing:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2'
}
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
index f0834ed2a34..ce4f6418a85 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
@@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: services.proto")
public class BenchmarkServiceGrpc {
diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
index 3a9a58cf7e2..3f4af55b4d1 100644
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
@@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: services.proto")
public class WorkerServiceGrpc {
diff --git a/build.gradle b/build.gradle
index 683ad759355..580504147e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ subprojects {
apply plugin: "com.google.osdetector"
group = "io.grpc"
- version = "1.1.0-SNAPSHOT" // CURRENT_GRPC_VERSION
+ version = "1.2.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 848d29861e7..bf24526357c 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.asyncUnimplementedStreamingCall;
*
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: test.proto")
public class TestServiceGrpc {
diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt
index 860a9533795..ce6729770fe 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.asyncUnimplementedStreamingCall;
*
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: test.proto")
public class TestServiceGrpc {
diff --git a/compiler/src/testNano/golden/TestService.java.txt b/compiler/src/testNano/golden/TestService.java.txt
index bf74753577a..cab068902b9 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.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: test.proto")
public class TestServiceGrpc {
diff --git a/documentation/server-reflection-tutorial.md b/documentation/server-reflection-tutorial.md
index 7fd4e40f4de..536ffe2be4a 100644
--- a/documentation/server-reflection-tutorial.md
+++ b/documentation/server-reflection-tutorial.md
@@ -21,7 +21,7 @@ need to make the following changes:
```diff
--- a/examples/build.gradle
+++ b/examples/build.gradle
-@@ -27,6 +27,7 @@ def grpcVersion = '1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+@@ -27,6 +27,7 @@ def grpcVersion = '1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
dependencies {
compile "io.grpc:grpc-netty:${grpcVersion}"
compile "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index 19d9a1f520e..8e16339d19a 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -34,7 +34,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
- artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ artifact = 'io.grpc:protoc-gen-grpc-java:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@@ -57,8 +57,8 @@ dependencies {
compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below.
- compile 'io.grpc:grpc-okhttp:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- compile 'io.grpc:grpc-protobuf-lite:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- compile 'io.grpc:grpc-stub:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-okhttp:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-protobuf-lite:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-stub:1.2.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 ca6685ffb98..5093e21c36b 100644
--- a/examples/android/routeguide/app/build.gradle
+++ b/examples/android/routeguide/app/build.gradle
@@ -32,7 +32,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
- artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ artifact = 'io.grpc:protoc-gen-grpc-java:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@@ -55,8 +55,8 @@ dependencies {
compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below.
- compile 'io.grpc:grpc-okhttp:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- compile 'io.grpc:grpc-protobuf-lite:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
- compile 'io.grpc:grpc-stub:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-okhttp:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-protobuf-lite:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+ compile 'io.grpc:grpc-stub:1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2'
}
diff --git a/examples/build.gradle b/examples/build.gradle
index 74a44b7c5ed..88104b4ce97 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.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
dependencies {
compile "io.grpc:grpc-netty:${grpcVersion}"
diff --git a/examples/pom.xml b/examples/pom.xml
index ca695af280a..8e5c1f89c8d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,11 +6,11 @@
jar
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
examples
http://maven.apache.org
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
diff --git a/examples/thrift/build.gradle b/examples/thrift/build.gradle
index 4c1760e1843..5cf20a02e05 100644
--- a/examples/thrift/build.gradle
+++ b/examples/thrift/build.gradle
@@ -4,7 +4,7 @@ description = "Thrift Examples"
startScripts.enabled = false
-def grpcVersion = '1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION
+def grpcVersion = '1.2.0-SNAPSHOT' // CURRENT_GRPC_VERSION
repositories {
mavenCentral()
diff --git a/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
index 573c6627a65..96d302af84f 100644
--- a/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
+++ b/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
@@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: load_balancer.proto")
public class LoadBalancerGrpc {
diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
index 8926aec1010..6b4f8212e7b 100644
--- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
@@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: health.proto")
public class HealthGrpc {
diff --git a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
index b81716e737b..3e08d910518 100644
--- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
@@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/v1alpha/reflection.proto")
public class ServerReflectionGrpc {
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
index f67868edc50..0a48f32b941 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
@@ -21,7 +21,7 @@
*
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public class AnotherDynamicServiceGrpc {
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
index dae56d3d548..95703bf0476 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
@@ -21,7 +21,7 @@
*
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public class DynamicServiceGrpc {
diff --git a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
index a4ca44eca21..9f61ad81f07 100644
--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
@@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/reflection/testing/reflection_test.proto")
public class ReflectableServiceGrpc {
diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
index 3bf0ddca9e5..ca0bd99c45f 100644
--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/metrics.proto")
public class MetricsServiceGrpc {
diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
index ec088a76c50..a417996d6f6 100644
--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@@ -21,7 +21,7 @@
*
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto")
public class ReconnectServiceGrpc {
diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
index aee416bd466..3bb77153297 100644
--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@@ -22,7 +22,7 @@
*
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto")
public class TestServiceGrpc {
diff --git a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
index e77568a78a6..8f20656f1ee 100644
--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@@ -22,7 +22,7 @@
*
*/
@javax.annotation.Generated(
- value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)",
+ value = "by gRPC proto compiler (version 1.2.0-SNAPSHOT)",
comments = "Source: io/grpc/testing/integration/test.proto")
public class UnimplementedServiceGrpc {