mirror of https://github.com/grpc/grpc-java.git
Start 1.11.0 development cycle
This commit is contained in:
parent
d792a72ea1
commit
2f05c23063
|
|
@ -34,7 +34,7 @@ protobuf {
|
||||||
}
|
}
|
||||||
plugins {
|
plugins {
|
||||||
grpc {
|
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 {
|
generateProtoTasks {
|
||||||
|
|
@ -62,10 +62,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.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.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
compile 'io.grpc:grpc-okhttp:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
compile 'io.grpc:grpc-stub:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
compile 'io.grpc:grpc-stub:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
compile 'io.grpc:grpc-testing:1.10.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 'javax.annotation:javax.annotation-api:1.2'
|
||||||
compile 'junit:junit:4.12'
|
compile 'junit:junit:4.12'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ subprojects {
|
||||||
idea.module.inheritOutputDirs = true
|
idea.module.inheritOutputDirs = true
|
||||||
|
|
||||||
group = "io.grpc"
|
group = "io.grpc"
|
||||||
version = "1.10.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
version = "1.11.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
sourceCompatibility = 1.6
|
||||||
targetCompatibility = 1.6
|
targetCompatibility = 1.6
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
|
||||||
* </pre>
|
* </pre>
|
||||||
*/
|
*/
|
||||||
@javax.annotation.Generated(
|
@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")
|
comments = "Source: test.proto")
|
||||||
public final class TestServiceGrpc {
|
public final class TestServiceGrpc {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
|
||||||
* </pre>
|
* </pre>
|
||||||
*/
|
*/
|
||||||
@javax.annotation.Generated(
|
@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")
|
comments = "Source: test.proto")
|
||||||
public final class TestServiceGrpc {
|
public final class TestServiceGrpc {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ import java.io.IOException;
|
||||||
* </pre>
|
* </pre>
|
||||||
*/
|
*/
|
||||||
@javax.annotation.Generated(
|
@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")
|
comments = "Source: test.proto")
|
||||||
public final class TestServiceGrpc {
|
public final class TestServiceGrpc {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -194,7 +194,7 @@ public final class GrpcUtil {
|
||||||
|
|
||||||
public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();
|
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.
|
* The default delay in nanos before we send a keepalive.
|
||||||
|
|
|
||||||
|
|
@ -48,8 +48,8 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'io.grpc:grpc-core: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.10.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_api.jar')
|
||||||
implementation files('libs/cronet_impl_common_java.jar')
|
implementation files('libs/cronet_impl_common_java.jar')
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,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.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
|
@ -57,8 +57,8 @@ dependencies {
|
||||||
compile 'com.android.support:appcompat-v7:27.0.2'
|
compile 'com.android.support:appcompat-v7:27.0.2'
|
||||||
|
|
||||||
// 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.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.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
compile 'io.grpc:grpc-protobuf-lite:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
compile 'io.grpc:grpc-stub:1.10.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'
|
compile 'javax.annotation:javax.annotation-api:1.2'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,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.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
artifact = 'io.grpc:protoc-gen-grpc-java:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
|
@ -56,8 +56,8 @@ dependencies {
|
||||||
compile 'com.android.support:appcompat-v7:27.0.2'
|
compile 'com.android.support:appcompat-v7:27.0.2'
|
||||||
|
|
||||||
// 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.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.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
compile 'io.grpc:grpc-protobuf-lite:1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
compile 'io.grpc:grpc-stub:1.10.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'
|
compile 'javax.annotation:javax.annotation-api:1.2'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
def grpcVersion = '1.11.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "com.google.api.grpc:proto-google-common-protos:1.0.0"
|
compile "com.google.api.grpc:proto-google-common-protos:1.0.0"
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,12 @@
|
||||||
<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.10.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
|
<version>1.11.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>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<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>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue