flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docs: update grpc version to 0.15.0 and protoc to 3.0.0-beta-3

This commit is contained in:
Sky Ao 2016-07-26 00:58:43 +08:00 committed by Carl Mastrangelo
parent d0c173b5d2
commit 841c7c4bfa
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README.md
View File

@ -27,33 +27,33 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>0.14.0</version>
<version>0.15.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>0.14.0</version>
<version>0.15.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>0.14.0</version>
<version>0.15.0</version>
</dependency>
```
Or for Gradle with non-Android, add to your dependencies:
```gradle
compile 'io.grpc:grpc-netty:0.14.0'
compile 'io.grpc:grpc-protobuf:0.14.0'
compile 'io.grpc:grpc-stub:0.14.0'
compile 'io.grpc:grpc-netty:0.15.0'
compile 'io.grpc:grpc-protobuf:0.15.0'
compile 'io.grpc:grpc-stub:0.15.0'
```
For Android client, use `grpc-okhttp` instead of `grpc-netty` and
`grpc-protobuf-nano` or `grpc-protobuf-lite` instead of `grpc-protobuf`:
```gradle
compile 'io.grpc:grpc-okhttp:0.14.0'
compile 'io.grpc:grpc-protobuf-nano:0.14.0'
compile 'io.grpc:grpc-stub:0.14.0'
compile 'io.grpc:grpc-okhttp:0.15.0'
compile 'io.grpc:grpc-protobuf-nano:0.15.0'
compile 'io.grpc:grpc-stub:0.15.0'
```
[the JARs]:
@ -87,9 +87,9 @@ For protobuf-based codegen integrated with the Maven build system, you can use
protobuf-java directly, you will be transitively depending on the
protobuf-java version that grpc depends on.
-->
<protocArtifact>com.google.protobuf:protoc:3.0.0-beta-2:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:3.0.0-beta-3:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:0.14.0:exe:${os.detected.classifier}</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:0.15.0:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
@ -128,11 +128,11 @@ protobuf {
// The version of protoc must match protobuf-java. If you don't depend on
// protobuf-java directly, you will be transitively depending on the
// protobuf-java version that grpc depends on.
artifact = "com.google.protobuf:protoc:3.0.0-beta-2"
artifact = "com.google.protobuf:protoc:3.0.0-beta-3"
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:0.14.0'
artifact = 'io.grpc:protoc-gen-grpc-java:0.15.0'
}
}
generateProtoTasks {