diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index 270982fed9..f5cade0012 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.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -61,9 +61,9 @@ 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.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-okhttp:1.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-testing:1.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION + 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 '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 16eb7790dd..415838f814 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.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 bc3d524679..5572d1d451 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: services.proto") public class WorkerServiceGrpc { diff --git a/build.gradle b/build.gradle index e1f75dbe50..e0607d4aa7 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ subprojects { apply plugin: "com.google.osdetector" group = "io.grpc" - version = "1.0.0-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.1.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 0e7a7d7aab..9be7964671 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.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.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 0b819190fd..b81fc9b914 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.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.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 4f198dae8c..18455b916b 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.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: test.proto") public class TestServiceGrpc { diff --git a/examples/android/app/build.gradle b/examples/android/app/build.gradle index bc69cccdb5..4e8dba93da 100644 --- a/examples/android/app/build.gradle +++ b/examples/android/app/build.gradle @@ -31,7 +31,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -62,8 +62,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.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION + 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 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index e9052090d7..4e6ffd031c 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.0.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.1.0-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { compile "io.grpc:grpc-netty:${grpcVersion}" diff --git a/examples/pom.xml b/examples/pom.xml index 26ef9da4d3..af97f02ba4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,11 +6,11 @@ jar - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT examples http://maven.apache.org - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT 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 70817a4edb..553c05ff4d 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: load_balancer.proto") public class LoadBalancerGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java index fc45a896f3..d771e65b89 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java @@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/metrics.proto") public class MetricsServiceGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java index 15420b2a7f..ee6077b073 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public class ReconnectServiceGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java index b03e1850d9..7b73fe2dba 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java @@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public class TestServiceGrpc { diff --git a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java index b3c44f2c09..b22e6fbdb2 100644 --- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java +++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java @@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public class UnimplementedServiceGrpc { 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 90db0e4e24..689aefd248 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.1.0-SNAPSHOT)", comments = "Source: health.proto") public class HealthGrpc {