all: begin 1.6 release cycle

This commit is contained in:
Carl Mastrangelo 2017-07-06 10:43:56 -07:00 committed by GitHub
parent cc5343a530
commit 424eeea8f5
24 changed files with 35 additions and 35 deletions

View File

@ -33,7 +33,7 @@ protobuf {
} }
plugins { plugins {
grpc { 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 { generateProtoTasks {
@ -60,10 +60,10 @@ dependencies {
compile 'com.android.support:support-annotations:23.1.1' compile 'com.android.support:support-annotations:23.1.1'
compile 'com.google.android.gms:play-services-base:7.3.0' compile 'com.google.android.gms:play-services-base:7.3.0'
// You need to build grpc-java to obtain the grpc libraries below. // 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-protobuf-nano:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-stub:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.5.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 'javax.annotation:javax.annotation-api:1.2'
compile 'junit:junit:4.12' compile 'junit:junit:4.12'

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: services.proto")
public final class BenchmarkServiceGrpc { public final class BenchmarkServiceGrpc {

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: services.proto")
public final class ReportQpsScenarioServiceGrpc { public final class ReportQpsScenarioServiceGrpc {

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: services.proto")
public final class WorkerServiceGrpc { public final class WorkerServiceGrpc {

View File

@ -44,7 +44,7 @@ subprojects {
} }
group = "io.grpc" group = "io.grpc"
version = "1.5.0-SNAPSHOT" // CURRENT_GRPC_VERSION version = "1.6.0-SNAPSHOT" // CURRENT_GRPC_VERSION
sourceCompatibility = 1.6 sourceCompatibility = 1.6
targetCompatibility = 1.6 targetCompatibility = 1.6

View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

View File

@ -23,7 +23,7 @@ import java.io.IOException;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

View File

@ -34,7 +34,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
} }
grpc { 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 { generateProtoTasks {
@ -54,8 +54,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:appcompat-v7:22.1.1'
// You need to build grpc-java to obtain these libraries below. // 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-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-protobuf-lite:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.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' compile 'javax.annotation:javax.annotation-api:1.2'
} }

View File

@ -32,7 +32,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
} }
grpc { 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 { generateProtoTasks {
@ -52,8 +52,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:23.+' compile 'com.android.support:appcompat-v7:23.+'
// You need to build grpc-java to obtain these libraries below. // 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-okhttp:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.5.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-protobuf-lite:1.6.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.5.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' compile 'javax.annotation:javax.annotation-api:1.2'
} }

View File

@ -22,7 +22,7 @@ repositories {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // 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 { dependencies {
compile "com.google.api.grpc:proto-google-common-protos:0.1.9" compile "com.google.api.grpc:proto-google-common-protos:0.1.9"

View File

@ -6,11 +6,11 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.5.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.6.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>examples</name> <name>examples</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<properties> <properties>
<grpc.version>1.5.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.6.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -12,7 +12,7 @@ repositories {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // 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 { dependencies {
compile "io.grpc:grpc-stub:${grpcVersion}" compile "io.grpc:grpc-stub:${grpcVersion}"

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: load_balancer.proto")
public final class LoadBalancerGrpc { public final class LoadBalancerGrpc {

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: health.proto")
public final class HealthGrpc { public final class HealthGrpc {

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: grpc/instrumentation/v1alpha/monitoring.proto")
public final class MonitoringGrpc { public final class MonitoringGrpc {

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/reflection/v1alpha/reflection.proto")
public final class ServerReflectionGrpc { public final class ServerReflectionGrpc {

View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public final class AnotherDynamicServiceGrpc { public final class AnotherDynamicServiceGrpc {

View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
public final class DynamicServiceGrpc { public final class DynamicServiceGrpc {

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/reflection/testing/reflection_test.proto")
public final class ReflectableServiceGrpc { public final class ReflectableServiceGrpc {

View File

@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
/** /**
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/testing/integration/metrics.proto")
public final class MetricsServiceGrpc { public final class MetricsServiceGrpc {

View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/testing/integration/test.proto")
public final class ReconnectServiceGrpc { public final class ReconnectServiceGrpc {

View File

@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/testing/integration/test.proto")
public final class TestServiceGrpc { public final class TestServiceGrpc {

View File

@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @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") comments = "Source: io/grpc/testing/integration/test.proto")
public final class UnimplementedServiceGrpc { public final class UnimplementedServiceGrpc {