diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index 81239c588d..37fcf68ed6 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -33,7 +33,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -60,10 +60,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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-okhttp:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-testing:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-nano:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-testing:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' compile 'junit:junit:4.12' 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 d64a25b48b..63109f9ceb 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.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: services.proto") public final class BenchmarkServiceGrpc { diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index 97556c390f..cf3e212271 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: services.proto") public final class ReportQpsScenarioServiceGrpc { 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 3854f1461e..688632d408 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.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: services.proto") public final class WorkerServiceGrpc { diff --git a/build.gradle b/build.gradle index dbfb21cfdf..0ce4390046 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ subprojects { } group = "io.grpc" - version = "1.5.0-SNAPSHOT" // CURRENT_GRPC_VERSION + version = "1.6.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 4ee73c7bf1..cca22a6d3e 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.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.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 855fcf4d67..d8b6dd6221 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.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.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 50a4c3e265..0a0e33a4a5 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.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: test.proto") public final class TestServiceGrpc { diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 563a60e1d2..0a861d6b0c 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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -54,8 +54,8 @@ dependencies { compile 'com.android.support:appcompat-v7:22.1.1' // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-okhttp:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.6.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 243b6ed1ce..992df78524 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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION + artifact = 'io.grpc:protoc-gen-grpc-java:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION } } generateProtoTasks { @@ -52,8 +52,8 @@ dependencies { compile 'com.android.support:appcompat-v7:23.+' // You need to build grpc-java to obtain these libraries below. - compile 'io.grpc:grpc-okhttp:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-protobuf-lite:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION - compile 'io.grpc:grpc-stub:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-protobuf-lite:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION + compile 'io.grpc:grpc-stub:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'javax.annotation:javax.annotation-api:1.2' } diff --git a/examples/build.gradle b/examples/build.gradle index 80cff3b846..9391c08433 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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { compile "com.google.api.grpc:proto-google-common-protos:0.1.9" diff --git a/examples/pom.xml b/examples/pom.xml index 1ec889a877..f72b053ac3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,11 +6,11 @@ jar - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT examples http://maven.apache.org - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT diff --git a/examples/thrift/build.gradle b/examples/thrift/build.gradle index 0b9ac1bab4..c6136ae1b9 100644 --- a/examples/thrift/build.gradle +++ b/examples/thrift/build.gradle @@ -12,7 +12,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.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION +def grpcVersion = '1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION dependencies { compile "io.grpc:grpc-stub:${grpcVersion}" 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 e38b6f7b2a..a688a814f5 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.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: load_balancer.proto") public final 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 a599ceb59c..e49a1c3f3b 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.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: health.proto") public final class HealthGrpc { diff --git a/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java b/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java index 404462d93f..25be8e8c35 100644 --- a/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java @@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: grpc/instrumentation/v1alpha/monitoring.proto") public final class MonitoringGrpc { 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 9ba9bfc4db..b2df8cfa06 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/reflection/v1alpha/reflection.proto") public final 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 07328241e0..39b65fdca5 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") public final 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 778191b020..77dfb7499b 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto") public final 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 2be87b54cc..0fc940161f 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/reflection/testing/reflection_test.proto") public final 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 68cd0da368..dd6495e3a1 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/metrics.proto") public final 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 94625d417a..f007995123 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public final 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 99f79ef947..debb0ad9b9 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public final 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 dc1b555f94..6740ce4b1c 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 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.5.0-SNAPSHOT)", + value = "by gRPC proto compiler (version 1.6.0-SNAPSHOT)", comments = "Source: io/grpc/testing/integration/test.proto") public final class UnimplementedServiceGrpc {