mirror of https://github.com/grpc/grpc-java.git
Start 1.25.0 development cycle (#6141)
This commit is contained in:
parent
415212fc49
commit
fa8f89a1a6
|
@ -42,7 +42,7 @@ protobuf {
|
||||||
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
||||||
plugins {
|
plugins {
|
||||||
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
||||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
@ -71,11 +71,11 @@ dependencies {
|
||||||
implementation 'junit:junit:4.12'
|
implementation 'junit:junit:4.12'
|
||||||
|
|
||||||
// You need to build grpc-java to obtain the grpc libraries below.
|
// You need to build grpc-java to obtain the grpc libraries below.
|
||||||
implementation 'io.grpc:grpc-auth:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-auth:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-okhttp:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-okhttp:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-protobuf-lite:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-protobuf-lite:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-stub:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-stub:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-testing:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-testing:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
// workaround for https://github.com/google/protobuf/issues/1889
|
// workaround for https://github.com/google/protobuf/issues/1889
|
||||||
protobuf 'com.google.protobuf:protobuf-java:3.0.2'
|
protobuf 'com.google.protobuf:protobuf-java:3.0.2'
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
group = "io.grpc"
|
group = "io.grpc"
|
||||||
version = "1.24.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
version = "1.25.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
||||||
description = 'gRPC: Android'
|
description = 'gRPC: Android'
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
|
@ -47,9 +47,9 @@ dependencies {
|
||||||
errorprone 'com.google.errorprone:error_prone_core:2.3.3'
|
errorprone 'com.google.errorprone:error_prone_core:2.3.3'
|
||||||
errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
|
errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
|
||||||
|
|
||||||
implementation 'io.grpc:grpc-core:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-core:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
testImplementation 'io.grpc:grpc-okhttp:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
testImplementation 'io.grpc:grpc-okhttp:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
testImplementation 'org.robolectric:robolectric:3.7.1'
|
testImplementation 'org.robolectric:robolectric:3.7.1'
|
||||||
testImplementation 'com.google.truth:truth:0.45'
|
testImplementation 'com.google.truth:truth:0.45'
|
||||||
|
|
|
@ -48,7 +48,7 @@ subprojects {
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "io.grpc"
|
group = "io.grpc"
|
||||||
version = "1.24.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
version = "1.25.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
sourceCompatibility = 1.7
|
sourceCompatibility = 1.7
|
||||||
targetCompatibility = 1.7
|
targetCompatibility = 1.7
|
||||||
|
|
|
@ -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.24.0-SNAPSHOT)",
|
value = "by gRPC proto compiler (version 1.25.0-SNAPSHOT)",
|
||||||
comments = "Source: grpc/testing/compiler/test.proto")
|
comments = "Source: grpc/testing/compiler/test.proto")
|
||||||
@java.lang.Deprecated
|
@java.lang.Deprecated
|
||||||
public final class TestDeprecatedServiceGrpc {
|
public final class TestDeprecatedServiceGrpc {
|
||||||
|
|
|
@ -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.24.0-SNAPSHOT)",
|
value = "by gRPC proto compiler (version 1.25.0-SNAPSHOT)",
|
||||||
comments = "Source: grpc/testing/compiler/test.proto")
|
comments = "Source: grpc/testing/compiler/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.24.0-SNAPSHOT)",
|
value = "by gRPC proto compiler (version 1.25.0-SNAPSHOT)",
|
||||||
comments = "Source: grpc/testing/compiler/test.proto")
|
comments = "Source: grpc/testing/compiler/test.proto")
|
||||||
@java.lang.Deprecated
|
@java.lang.Deprecated
|
||||||
public final class TestDeprecatedServiceGrpc {
|
public final class TestDeprecatedServiceGrpc {
|
||||||
|
|
|
@ -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.24.0-SNAPSHOT)",
|
value = "by gRPC proto compiler (version 1.25.0-SNAPSHOT)",
|
||||||
comments = "Source: grpc/testing/compiler/test.proto")
|
comments = "Source: grpc/testing/compiler/test.proto")
|
||||||
public final class TestServiceGrpc {
|
public final class TestServiceGrpc {
|
||||||
|
|
||||||
|
|
|
@ -195,7 +195,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.24.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
|
private static final String IMPLEMENTATION_VERSION = "1.25.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The default timeout in nanos for a keepalive ping request.
|
* The default timeout in nanos for a keepalive ping request.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
group = "io.grpc"
|
group = "io.grpc"
|
||||||
version = "1.24.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
version = "1.25.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
||||||
description = "gRPC: Cronet Android"
|
description = "gRPC: Cronet Android"
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
|
@ -54,8 +54,8 @@ dependencies {
|
||||||
errorprone 'com.google.errorprone:error_prone_core:2.3.3'
|
errorprone 'com.google.errorprone:error_prone_core:2.3.3'
|
||||||
errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
|
errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
|
||||||
|
|
||||||
implementation 'io.grpc:grpc-core:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-core:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
testImplementation 'io.grpc:grpc-testing:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
testImplementation 'io.grpc:grpc-testing:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
implementation 'org.chromium.net:cronet-api:76.3809.111'
|
implementation 'org.chromium.net:cronet-api:76.3809.111'
|
||||||
testImplementation 'org.chromium.net:cronet-embedded:66.3359.158'
|
testImplementation 'org.chromium.net:cronet-embedded:66.3359.158'
|
||||||
|
|
|
@ -31,7 +31,7 @@ protobuf {
|
||||||
protoc { artifact = 'com.google.protobuf:protoc:3.4.0' }
|
protoc { artifact = 'com.google.protobuf:protoc:3.4.0' }
|
||||||
plugins {
|
plugins {
|
||||||
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
||||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
@ -49,12 +49,12 @@ dependencies {
|
||||||
implementation 'com.android.support:appcompat-v7:27.0.2'
|
implementation '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.
|
||||||
implementation 'io.grpc:grpc-okhttp:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-okhttp:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-protobuf-lite:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-protobuf-lite:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-stub:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-stub:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'javax.annotation:javax.annotation-api:1.2'
|
implementation 'javax.annotation:javax.annotation-api:1.2'
|
||||||
|
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
testImplementation 'com.google.truth:truth:0.45'
|
testImplementation 'com.google.truth:truth:0.45'
|
||||||
testImplementation 'io.grpc:grpc-testing:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
testImplementation 'io.grpc:grpc-testing:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ protobuf {
|
||||||
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
||||||
plugins {
|
plugins {
|
||||||
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
||||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
@ -48,8 +48,8 @@ dependencies {
|
||||||
implementation 'com.android.support:appcompat-v7:27.0.2'
|
implementation '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.
|
||||||
implementation 'io.grpc:grpc-okhttp:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-okhttp:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-protobuf-lite:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-protobuf-lite:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-stub:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-stub:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'javax.annotation:javax.annotation-api:1.2'
|
implementation 'javax.annotation:javax.annotation-api:1.2'
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ protobuf {
|
||||||
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
||||||
plugins {
|
plugins {
|
||||||
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
||||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
@ -47,8 +47,8 @@ dependencies {
|
||||||
implementation 'com.android.support:appcompat-v7:27.0.2'
|
implementation '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.
|
||||||
implementation 'io.grpc:grpc-okhttp:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-okhttp:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-protobuf-lite:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-protobuf-lite:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-stub:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-stub:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'javax.annotation:javax.annotation-api:1.2'
|
implementation 'javax.annotation:javax.annotation-api:1.2'
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ protobuf {
|
||||||
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
||||||
plugins {
|
plugins {
|
||||||
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
||||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
@ -48,8 +48,8 @@ dependencies {
|
||||||
implementation 'com.android.support:appcompat-v7:28.0.0'
|
implementation 'com.android.support:appcompat-v7:28.0.0'
|
||||||
|
|
||||||
// You need to build grpc-java to obtain these libraries below.
|
// You need to build grpc-java to obtain these libraries below.
|
||||||
implementation 'io.grpc:grpc-okhttp:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-okhttp:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-protobuf-lite:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-protobuf-lite:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-stub:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-stub:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'javax.annotation:javax.annotation-api:1.2'
|
implementation 'javax.annotation:javax.annotation-api:1.2'
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ targetCompatibility = 1.7
|
||||||
|
|
||||||
// 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.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
def grpcVersion = '1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
def protobufVersion = '3.9.0'
|
def protobufVersion = '3.9.0'
|
||||||
def protocVersion = protobufVersion
|
def protocVersion = protobufVersion
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ targetCompatibility = 1.7
|
||||||
|
|
||||||
// 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.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
def grpcVersion = '1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
def protocVersion = '3.9.0'
|
def protocVersion = '3.9.0'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -22,7 +22,7 @@ targetCompatibility = 1.7
|
||||||
|
|
||||||
// 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.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
def grpcVersion = '1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
def protobufVersion = '3.9.0'
|
def protobufVersion = '3.9.0'
|
||||||
def protocVersion = protobufVersion
|
def protocVersion = protobufVersion
|
||||||
|
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
<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.24.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
|
<version>1.25.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
|
||||||
<name>example-gauth</name>
|
<name>example-gauth</name>
|
||||||
<url>https://github.com/grpc/grpc-java</url>
|
<url>https://github.com/grpc/grpc-java</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<grpc.version>1.24.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
<grpc.version>1.25.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||||
<protobuf.version>3.9.0</protobuf.version>
|
<protobuf.version>3.9.0</protobuf.version>
|
||||||
<!-- required for jdk9 -->
|
<!-- required for jdk9 -->
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
|
|
|
@ -52,7 +52,7 @@ protobuf {
|
||||||
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
|
||||||
plugins {
|
plugins {
|
||||||
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
|
||||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
|
@ -72,9 +72,9 @@ dependencies {
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
|
|
||||||
// You need to build grpc-java to obtain these libraries below.
|
// You need to build grpc-java to obtain these libraries below.
|
||||||
implementation 'io.grpc:grpc-okhttp:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-okhttp:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-protobuf-lite:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-protobuf-lite:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
implementation 'io.grpc:grpc-stub:1.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
implementation 'io.grpc:grpc-stub:1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories { mavenCentral() }
|
repositories { mavenCentral() }
|
||||||
|
|
|
@ -25,7 +25,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.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
def grpcVersion = '1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
def kotlinVersion = plugins.findPlugin("org.jetbrains.kotlin.jvm").kotlinPluginVersion
|
def kotlinVersion = plugins.findPlugin("org.jetbrains.kotlin.jvm").kotlinPluginVersion
|
||||||
|
|
|
@ -22,7 +22,7 @@ targetCompatibility = 1.7
|
||||||
|
|
||||||
// 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.24.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
def grpcVersion = '1.25.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||||
def nettyTcNativeVersion = '2.0.25.Final'
|
def nettyTcNativeVersion = '2.0.25.Final'
|
||||||
def protocVersion = '3.9.0'
|
def protocVersion = '3.9.0'
|
||||||
|
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
<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.24.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
|
<version>1.25.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
|
||||||
<name>example-tls</name>
|
<name>example-tls</name>
|
||||||
<url>https://github.com/grpc/grpc-java</url>
|
<url>https://github.com/grpc/grpc-java</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<grpc.version>1.24.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
<grpc.version>1.25.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||||
<protoc.version>3.9.0</protoc.version>
|
<protoc.version>3.9.0</protoc.version>
|
||||||
<netty.tcnative.version>2.0.25.Final</netty.tcnative.version>
|
<netty.tcnative.version>2.0.25.Final</netty.tcnative.version>
|
||||||
<!-- required for jdk9 -->
|
<!-- required for jdk9 -->
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
<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.24.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
|
<version>1.25.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
|
||||||
<name>examples</name>
|
<name>examples</name>
|
||||||
<url>https://github.com/grpc/grpc-java</url>
|
<url>https://github.com/grpc/grpc-java</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<grpc.version>1.24.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
<grpc.version>1.25.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||||
<protobuf.version>3.9.0</protobuf.version>
|
<protobuf.version>3.9.0</protobuf.version>
|
||||||
<protoc.version>3.9.0</protoc.version>
|
<protoc.version>3.9.0</protoc.version>
|
||||||
<!-- required for jdk9 -->
|
<!-- required for jdk9 -->
|
||||||
|
|
Loading…
Reference in New Issue