Skip to content

Commit dfe0643

Browse files
carl-mastrangelocarl-mastrangelo
committed
all: update to 1.1.1, and use protoc 3.1.0-build2
1 parent 46f6681 commit dfe0643

File tree

26 files changed

+56
-56
lines changed

26 files changed

+56
-56
lines changed

‎README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,37 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
2828
<dependency>
2929
<groupId>io.grpc</groupId>
3030
<artifactId>grpc-netty</artifactId>
31-
<version>1.1.0</version>
31+
<version>1.1.1</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>io.grpc</groupId>
3535
<artifactId>grpc-protobuf</artifactId>
36-
<version>1.1.0</version>
36+
<version>1.1.1</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>io.grpc</groupId>
4040
<artifactId>grpc-stub</artifactId>
41-
<version>1.1.0</version>
41+
<version>1.1.1</version>
4242
</dependency>
4343
```
4444

4545
Or for Gradle with non-Android, add to your dependencies:
4646
```gradle
47-
compile 'io.grpc:grpc-netty:1.1.0'
48-
compile 'io.grpc:grpc-protobuf:1.1.0'
49-
compile 'io.grpc:grpc-stub:1.1.0'
47+
compile 'io.grpc:grpc-netty:1.1.1'
48+
compile 'io.grpc:grpc-protobuf:1.1.1'
49+
compile 'io.grpc:grpc-stub:1.1.1'
5050
```
5151

5252
For Android client, use `grpc-okhttp` instead of `grpc-netty` and
5353
`grpc-protobuf-lite` or `grpc-protobuf-nano` instead of `grpc-protobuf`:
5454
```gradle
55-
compile 'io.grpc:grpc-okhttp:1.1.0'
56-
compile 'io.grpc:grpc-protobuf-lite:1.1.0'
57-
compile 'io.grpc:grpc-stub:1.1.0'
55+
compile 'io.grpc:grpc-okhttp:1.1.1'
56+
compile 'io.grpc:grpc-protobuf-lite:1.1.1'
57+
compile 'io.grpc:grpc-stub:1.1.1'
5858
```
5959

6060
[the JARs]:
61-
http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.grpc%22%20AND%20v%3A%221.1.0%22
61+
http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.grpc%22%20AND%20v%3A%221.1.1%22
6262

6363
Development snapshots are available in [Sonatypes's snapshot
6464
repository](https://oss.sonatype.org/content/repositories/snapshots/).
@@ -85,9 +85,9 @@ For protobuf-based codegen integrated with the Maven build system, you can use
8585
<artifactId>protobuf-maven-plugin</artifactId>
8686
<version>0.5.0</version>
8787
<configuration>
88-
<protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
88+
<protocArtifact>com.google.protobuf:protoc:3.1.0-build2:exe:${os.detected.classifier}</protocArtifact>
8989
<pluginId>grpc-java</pluginId>
90-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.1.0:exe:${os.detected.classifier}</pluginArtifact>
90+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.1.1:exe:${os.detected.classifier}</pluginArtifact>
9191
</configuration>
9292
<executions>
9393
<execution>
@@ -123,11 +123,11 @@ buildscript {
123123
124124
protobuf {
125125
protoc {
126-
artifact = "com.google.protobuf:protoc:3.0.2"
126+
artifact = "com.google.protobuf:protoc:3.1.0-build2"
127127
}
128128
plugins {
129129
grpc {
130-
artifact = 'io.grpc:protoc-gen-grpc-java:1.1.0'
130+
artifact = 'io.grpc:protoc-gen-grpc-java:1.1.1'
131131
}
132132
}
133133
generateProtoTasks {

‎android-interop-testing/app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ android {
2828

2929
protobuf {
3030
protoc {
31-
artifact = 'com.google.protobuf:protoc:3.1.0'
31+
artifact = 'com.google.protobuf:protoc:3.1.0-build2'
3232
}
3333
plugins {
3434
grpc {
35-
artifact = 'io.grpc:protoc-gen-grpc-java:1.1.1-SNAPSHOT' // CURRENT_GRPC_VERSION
35+
artifact = 'io.grpc:protoc-gen-grpc-java:1.1.1' // CURRENT_GRPC_VERSION
3636
}
3737
}
3838
generateProtoTasks {
@@ -61,10 +61,10 @@ dependencies {
6161
compile 'com.google.guava:guava:18.0'
6262
compile 'com.squareup.okhttp:okhttp:2.2.0'
6363
// You need to build grpc-java to obtain these libraries below.
64-
compile 'io.grpc:grpc-protobuf-nano:1.1.1-SNAPSHOT' // CURRENT_GRPC_VERSION
65-
compile 'io.grpc:grpc-okhttp:1.1.1-SNAPSHOT' // CURRENT_GRPC_VERSION
66-
compile 'io.grpc:grpc-stub:1.1.1-SNAPSHOT' // CURRENT_GRPC_VERSION
67-
compile 'io.grpc:grpc-testing:1.1.1-SNAPSHOT' // CURRENT_GRPC_VERSION
64+
compile 'io.grpc:grpc-protobuf-nano:1.1.1' // CURRENT_GRPC_VERSION
65+
compile 'io.grpc:grpc-okhttp:1.1.1' // CURRENT_GRPC_VERSION
66+
compile 'io.grpc:grpc-stub:1.1.1' // CURRENT_GRPC_VERSION
67+
compile 'io.grpc:grpc-testing:1.1.1' // CURRENT_GRPC_VERSION
6868
compile 'javax.annotation:javax.annotation-api:1.2'
6969
}
7070

‎benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
*/
2020
@javax.annotation.Generated(
21-
value = "by gRPC proto compiler (version 1.1.1-SNAPSHOT)",
21+
value = "by gRPC proto compiler (version 1.1.1)",
2222
comments = "Source: services.proto")
2323
public class BenchmarkServiceGrpc {
2424

‎benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
*/
2020
@javax.annotation.Generated(
21-
value = "by gRPC proto compiler (version 1.1.1-SNAPSHOT)",
21+
value = "by gRPC proto compiler (version 1.1.1)",
2222
comments = "Source: services.proto")
2323
public class WorkerServiceGrpc {
2424

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ subprojects {
1919
apply plugin: "com.google.osdetector"
2020

2121
group = "io.grpc"
22-
version = "1.1.1-SNAPSHOT" // CURRENT_GRPC_VERSION
22+
version = "1.1.1" // CURRENT_GRPC_VERSION
2323

2424
sourceCompatibility = 1.6
2525
targetCompatibility = 1.6
@@ -76,7 +76,7 @@ subprojects {
7676
if (project.hasProperty('protoc')) {
7777
path = project.protoc
7878
} else {
79-
artifact = "com.google.protobuf:protoc:${protobufVersion}"
79+
artifact = "com.google.protobuf:protoc:${protobufVersion}-build2"
8080
}
8181
}
8282
plugins {

‎compiler/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ protobuf {
159159
if (project.hasProperty('protoc')) {
160160
path = project.protoc
161161
} else {
162-
artifact = "com.google.protobuf:protoc:${protobufVersion}"
162+
artifact = "com.google.protobuf:protoc:${protobufVersion}-build2"
163163
}
164164
}
165165
plugins {

‎compiler/src/test/golden/TestService.java.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
2121
* </pre>
2222
*/
2323
@javax.annotation.Generated(
24-
value = "by gRPC proto compiler (version 1.1.1-SNAPSHOT)",
24+
value = "by gRPC proto compiler (version 1.1.1)",
2525
comments = "Source: test.proto")
2626
public class TestServiceGrpc {
2727

‎compiler/src/testLite/golden/TestService.java.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
2121
* </pre>
2222
*/
2323
@javax.annotation.Generated(
24-
value = "by gRPC proto compiler (version 1.1.1-SNAPSHOT)",
24+
value = "by gRPC proto compiler (version 1.1.1)",
2525
comments = "Source: test.proto")
2626
public class TestServiceGrpc {
2727

‎compiler/src/testNano/golden/TestService.java.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import java.io.IOException;
2323
* </pre>
2424
*/
2525
@javax.annotation.Generated(
26-
value = "by gRPC proto compiler (version 1.1.1-SNAPSHOT)",
26+
value = "by gRPC proto compiler (version 1.1.1)",
2727
comments = "Source: test.proto")
2828
public class TestServiceGrpc {
2929

‎documentation/server-reflection-tutorial.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ need to make the following changes:
2121
```diff
2222
--- a/examples/build.gradle
2323
+++ b/examples/build.gradle
24-
@@ -27,6 +27,7 @@ def grpcVersion = '1.1.1-SNAPSHOT' // CURRENT_GRPC_VERSION
24+
@@ -27,6 +27,7 @@ def grpcVersion = '1.1.1' // CURRENT_GRPC_VERSION
2525
dependencies {
2626
compile "io.grpc:grpc-netty:${grpcVersion}"
2727
compile "io.grpc:grpc-protobuf:${grpcVersion}"

0 commit comments

Comments
 (0)