Skip to content

Commit

Permalink
Revert "Bump version to 1.19.1-SNAPSHOT"
Browse files Browse the repository at this point in the history
This reverts commit 7f41899.
  • Loading branch information
creamsoup committed Feb 27, 2019
1 parent 7f41899 commit 77af87c
Show file tree
Hide file tree
Showing 24 changed files with 49 additions and 49 deletions.
12 changes: 6 additions & 6 deletions android-interop-testing/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.6.1' }
plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.0' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand Down Expand Up @@ -71,11 +71,11 @@ dependencies {
implementation 'junit:junit:4.12'

// You need to build grpc-java to obtain the grpc libraries below.
implementation 'io.grpc:grpc-auth:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-testing:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-auth:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-testing:1.19.0' // CURRENT_GRPC_VERSION

// workaround for https://github.com/google/protobuf/issues/1889
protobuf 'com.google.protobuf:protobuf-java:3.0.2'
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'

group = "io.grpc"
version = "1.19.1-SNAPSHOT" // CURRENT_GRPC_VERSION
version = "1.19.0" // CURRENT_GRPC_VERSION
description = 'gRPC: Android'

buildscript {
Expand Down Expand Up @@ -44,9 +44,9 @@ dependencies {
errorprone 'com.google.errorprone:error_prone_core:2.3.2'
errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'

implementation 'io.grpc:grpc-core:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-core:1.19.0' // CURRENT_GRPC_VERSION

testImplementation 'io.grpc:grpc-okhttp:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
testImplementation 'io.grpc:grpc-okhttp:1.19.0' // CURRENT_GRPC_VERSION
testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:3.7.1'
testImplementation 'com.google.truth:truth:0.39'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ subprojects {
}

group = "io.grpc"
version = "1.19.1-SNAPSHOT" // CURRENT_GRPC_VERSION
version = "1.19.0" // CURRENT_GRPC_VERSION

sourceCompatibility = 1.7
targetCompatibility = 1.7
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/test/golden/TestDeprecatedService.java.txt
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.19.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.19.0)",
comments = "Source: grpc/testing/compiler/test.proto")
@java.lang.Deprecated
public final class TestDeprecatedServiceGrpc {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/test/golden/TestService.java.txt
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.19.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.19.0)",
comments = "Source: grpc/testing/compiler/test.proto")
public final class TestServiceGrpc {

Expand Down
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.19.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.19.0)",
comments = "Source: grpc/testing/compiler/test.proto")
@java.lang.Deprecated
public final class TestDeprecatedServiceGrpc {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/testLite/golden/TestService.java.txt
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.19.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.19.0)",
comments = "Source: grpc/testing/compiler/test.proto")
public final class TestServiceGrpc {

Expand Down
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.19.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.19.0)",
comments = "Source: grpc/testing/compiler/test.proto")
@java.lang.Deprecated
public final class TestDeprecatedServiceGrpc {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/testNano/golden/TestService.java.txt
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.19.1-SNAPSHOT)",
value = "by gRPC proto compiler (version 1.19.0)",
comments = "Source: grpc/testing/compiler/test.proto")
public final class TestServiceGrpc {

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

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

private static final String IMPLEMENTATION_VERSION = "1.19.1-SNAPSHOT"; // CURRENT_GRPC_VERSION
private static final String IMPLEMENTATION_VERSION = "1.19.0"; // CURRENT_GRPC_VERSION

/**
* The default delay in nanos before we send a keepalive.
Expand Down
4 changes: 2 additions & 2 deletions cronet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {
}

dependencies {
implementation 'io.grpc:grpc-core:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
testImplementation 'io.grpc:grpc-testing:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-core:1.19.0' // CURRENT_GRPC_VERSION
testImplementation 'io.grpc:grpc-testing:1.19.0' // CURRENT_GRPC_VERSION

implementation "org.chromium.net:cronet-embedded:66.3359.158"

Expand Down
4 changes: 2 additions & 2 deletions documentation/android-channel-builder.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ In your `build.gradle` file, include a dependency on both `grpc-android` and
`grpc-okhttp`:

```
compile 'io.grpc:grpc-android:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-android:1.19.0' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.19.0' // CURRENT_GRPC_VERSION
```

You will also need permission to access the device's network state in your
Expand Down
10 changes: 5 additions & 5 deletions examples/android/clientcache/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.4.0' }
plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.0' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -49,12 +49,12 @@ dependencies {
implementation 'com.android.support:appcompat-v7:27.0.2'

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.2'

testImplementation 'junit:junit:4.12'
testImplementation 'com.google.truth:truth:0.36'
testImplementation 'io.grpc:grpc-testing:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
testImplementation 'io.grpc:grpc-testing:1.19.0' // CURRENT_GRPC_VERSION
}
8 changes: 4 additions & 4 deletions examples/android/helloworld/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.6.1' }
plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.0' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -48,8 +48,8 @@ dependencies {
implementation 'com.android.support:appcompat-v7:27.0.2'

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.2'
}
8 changes: 4 additions & 4 deletions examples/android/routeguide/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.6.1' }
plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.0' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -47,8 +47,8 @@ dependencies {
implementation 'com.android.support:appcompat-v7:27.0.2'

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.2'
}
2 changes: 1 addition & 1 deletion examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ targetCompatibility = 1.7

// 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.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.19.0' // CURRENT_GRPC_VERSION
def protobufVersion = '3.6.1'
def protocVersion = protobufVersion

Expand Down
2 changes: 1 addition & 1 deletion examples/example-alts/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ targetCompatibility = 1.7

// 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.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.19.0' // CURRENT_GRPC_VERSION
def protocVersion = '3.6.1'

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion examples/example-gauth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ targetCompatibility = 1.7

// 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.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.19.0' // CURRENT_GRPC_VERSION
def protobufVersion = '3.6.1'
def protocVersion = protobufVersion

Expand Down
4 changes: 2 additions & 2 deletions examples/example-gauth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<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.19.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.19.0</version><!-- CURRENT_GRPC_VERSION -->
<name>example-gauth</name>
<url>https://github.com/grpc/grpc-java</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.19.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.19.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.6.1</protobuf.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source>
Expand Down
8 changes: 4 additions & 4 deletions examples/example-kotlin/android/helloworld/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.6.1' }
plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.19.0' // CURRENT_GRPC_VERSION
}
}
generateProtoTasks {
Expand All @@ -72,9 +72,9 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-okhttp:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.19.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.19.0' // CURRENT_GRPC_VERSION
}

repositories { mavenCentral() }
2 changes: 1 addition & 1 deletion examples/example-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.19.0' // CURRENT_GRPC_VERSION

dependencies {
def kotlinVerion = plugins.findPlugin("org.jetbrains.kotlin.jvm").kotlinPluginVersion
Expand Down
2 changes: 1 addition & 1 deletion examples/example-tls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ targetCompatibility = 1.7

// 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.19.1-SNAPSHOT' // CURRENT_GRPC_VERSION
def grpcVersion = '1.19.0' // CURRENT_GRPC_VERSION
def nettyTcNativeVersion = '2.0.20.Final'
def protocVersion = '3.6.1'

Expand Down
4 changes: 2 additions & 2 deletions examples/example-tls/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<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.19.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.19.0</version><!-- CURRENT_GRPC_VERSION -->
<name>example-tls</name>
<url>https://github.com/grpc/grpc-java</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.19.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.19.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.6.1</protoc.version>
<netty.tcnative.version>2.0.20.Final</netty.tcnative.version>
<!-- required for jdk9 -->
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<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.19.1-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<version>1.19.0</version><!-- CURRENT_GRPC_VERSION -->
<name>examples</name>
<url>https://github.com/grpc/grpc-java</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.19.1-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<grpc.version>1.19.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.6.1</protobuf.version>
<protoc.version>3.6.1</protoc.version>
<!-- required for jdk9 -->
Expand Down

0 comments on commit 77af87c

Please sign in to comment.