Start 1.11.0 development cycle

This commit is contained in:
Eric Gribkoff 2018-01-30 15:13:55 -08:00 committed by GitHub
parent d792a72ea1
commit 2f05c23063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 23 additions and 23 deletions

View File

@ -34,7 +34,7 @@ protobuf {
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@ -62,10 +62,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.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-nano:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2'
compile 'junit:junit:4.12'

View File

@ -53,7 +53,7 @@ subprojects {
idea.module.inheritOutputDirs = true
group = "io.grpc"
version = "1.10.0-SNAPSHOT" // CURRENT_GRPC_VERSION
version = "1.11.0-SNAPSHOT" // CURRENT_GRPC_VERSION
sourceCompatibility = 1.6
targetCompatibility = 1.6

View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.11.0-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

View File

@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.11.0-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

View File

@ -23,7 +23,7 @@ import java.io.IOException;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.11.0-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

View File

@ -194,7 +194,7 @@ public final class GrpcUtil {
public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();
private static final String IMPLEMENTATION_VERSION = "1.10.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
private static final String IMPLEMENTATION_VERSION = "1.11.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
/**
* The default delay in nanos before we send a keepalive.

View File

@ -48,8 +48,8 @@ android {
}
dependencies {
implementation 'io.grpc:grpc-core:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
testImplementation 'io.grpc:grpc-testing:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-core:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
testImplementation 'io.grpc:grpc-testing:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation files('libs/cronet_api.jar')
implementation files('libs/cronet_impl_common_java.jar')

View File

@ -37,7 +37,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@ -57,8 +57,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:27.0.2'
// You need to build grpc-java to obtain these libraries below.
compile 'io.grpc:grpc-okhttp:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'javax.annotation:javax.annotation-api:1.2'
}

View File

@ -36,7 +36,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
@ -56,8 +56,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:27.0.2'
// You need to build grpc-java to obtain these libraries below.
compile 'io.grpc:grpc-okhttp:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
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
// updating the version in our release process.
def grpcVersion = '1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
dependencies {
compile "com.google.api.grpc:proto-google-common-protos:1.0.0"

View File

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