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

Update README to reference 1.6.1 (#3428)

This commit is contained in:
zpencer 2017-08-31 15:24:33 -07:00 committed by GitHub
parent 4c721b7490
commit b579528c89
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README.md
View File

@ -28,37 +28,37 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>1.4.0</version>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.4.0</version>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.4.0</version>
<version>1.6.1</version>
</dependency>
```
Or for Gradle with non-Android, add to your dependencies:
```gradle
compile 'io.grpc:grpc-netty:1.4.0'
compile 'io.grpc:grpc-protobuf:1.4.0'
compile 'io.grpc:grpc-stub:1.4.0'
compile 'io.grpc:grpc-netty:1.6.1'
compile 'io.grpc:grpc-protobuf:1.6.1'
compile 'io.grpc:grpc-stub:1.6.1'
```
For Android client, use `grpc-okhttp` instead of `grpc-netty` and
`grpc-protobuf-lite` or `grpc-protobuf-nano` instead of `grpc-protobuf`:
```gradle
compile 'io.grpc:grpc-okhttp:1.4.0'
compile 'io.grpc:grpc-protobuf-lite:1.4.0'
compile 'io.grpc:grpc-stub:1.4.0'
compile 'io.grpc:grpc-okhttp:1.6.1'
compile 'io.grpc:grpc-protobuf-lite:1.6.1'
compile 'io.grpc:grpc-stub:1.6.1'
```
[the JARs]:
http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.grpc%22%20AND%20v%3A%221.4.0%22
http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.grpc%22%20AND%20v%3A%221.6.1%22
Development snapshots are available in [Sonatypes's snapshot
repository](https://oss.sonatype.org/content/repositories/snapshots/).
@ -87,7 +87,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.6.1:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
@ -123,11 +123,11 @@ buildscript {
protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.2.0"
artifact = "com.google.protobuf:protoc:3.3.0"
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.4.0'
artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1'
}
}
generateProtoTasks {

8
SECURITY.md
View File

@ -62,7 +62,7 @@ In Maven, you can use the [os-maven-plugin](https://github.com/trustin/os-maven-
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.3.Final</version>
<version>2.0.5.Final</version>
</dependency>
</dependencies>
</project>
@ -80,7 +80,7 @@ buildscript {
}
dependencies {
compile 'io.netty:netty-tcnative-boringssl-static:2.0.3.Final'
compile 'io.netty:netty-tcnative-boringssl-static:2.0.5.Final'
}
```
@ -115,7 +115,7 @@ In Maven, you can use the [os-maven-plugin](https://github.com/trustin/os-maven-
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
<version>2.0.3.Final</version>
<version>2.0.5.Final</version>
<classifier>${tcnative.classifier}</classifier>
</dependency>
</dependencies>
@ -183,7 +183,7 @@ if (osdetector.os == "linux" && osdetector.release.isLike("fedora")) {
}
dependencies {
compile 'io.netty:netty-tcnative:2.0.3.Final:' + tcnative_classifier
compile 'io.netty:netty-tcnative:2.0.5.Final:' + tcnative_classifier
}
```