Skip to content

Start 1.10.0 development cycle #3877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhangkun83 merged 1 commit into from
Dec 18, 2017
Merged

Start 1.10.0 development cycle #3877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions android-interop-testing/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protobuf {
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand Down Expand Up @@ -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.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-testing:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
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 'javax.annotation:javax.annotation-api:1.2'
compile 'junit:junit:4.12'

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ subprojects {
idea.module.inheritOutputDirs = true

group = "io.grpc"
version = "1.9.0-SNAPSHOT" // CURRENT_GRPC_VERSION
version = "1.10.0-SNAPSHOT" // CURRENT_GRPC_VERSION

sourceCompatibility = 1.6
targetCompatibility = 1.6
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/test/golden/TestService.java.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.9.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/testLite/golden/TestService.java.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.9.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/testNano/golden/TestService.java.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import java.io.IOException;
* </pre>
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.9.0-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.10.0-SNAPSHOT)",
comments = "Source: test.proto")
public final class TestServiceGrpc {

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/grpc/internal/GrpcUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public byte[] parseAsciiString(byte[] serialized) {

public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();

private static final String IMPLEMENTATION_VERSION = "1.9.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
private static final String IMPLEMENTATION_VERSION = "1.10.0-SNAPSHOT"; // CURRENT_GRPC_VERSION

/**
* The default delay in nanos before we send a keepalive.
Expand Down
8 changes: 4 additions & 4 deletions examples/android/helloworld/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -55,8 +55,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.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
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 'javax.annotation:javax.annotation-api:1.2'
}
8 changes: 4 additions & 4 deletions examples/android/routeguide/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protobuf {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
}
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
artifact = 'io.grpc:protoc-gen-grpc-java:1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -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.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-protobuf-lite:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-stub:1.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
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 'javax.annotation:javax.annotation-api:1.2'
}
2 changes: 1 addition & 1 deletion examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.10.0-SNAPSHOT' // CURRENT_GRPC_VERSION

dependencies {
compile "com.google.api.grpc:proto-google-common-protos:1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.10.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.9.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.10.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
</properties>
<dependencies>
<dependency>
Expand Down