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

all: update to proto 3.9.0

This commit is contained in:
Carl Mastrangelo 2019-07-26 13:53:05 -07:00 committed by GitHub
parent 65109e6738
commit 57e7bd394e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
COMPILING.md
View File

@ -44,7 +44,7 @@ For Linux, Mac and MinGW:
``` ```
$ git clone https://github.com/google/protobuf.git $ git clone https://github.com/google/protobuf.git
$ cd protobuf $ cd protobuf
$ git checkout v3.7.1 $ git checkout v3.9.0
$ ./autogen.sh $ ./autogen.sh
$ ./configure --disable-shared $ ./configure --disable-shared
$ make $ make
@ -83,16 +83,16 @@ When building on Windows and VC++, you need to specify project properties for
Gradle to find protobuf: Gradle to find protobuf:
``` ```
.\gradlew publishToMavenLocal ^ .\gradlew publishToMavenLocal ^
-PvcProtobufInclude=C:\path\to\protobuf-3.7.1\src ^ -PvcProtobufInclude=C:\path\to\protobuf-3.9.0\src ^
-PvcProtobufLibs=C:\path\to\protobuf-3.7.1\vsprojects\Release ^ -PvcProtobufLibs=C:\path\to\protobuf-3.9.0\vsprojects\Release ^
-PtargetArch=x86_32 -PtargetArch=x86_32
``` ```
Since specifying those properties every build is bothersome, you can instead Since specifying those properties every build is bothersome, you can instead
create ``<project-root>\gradle.properties`` with contents like: create ``<project-root>\gradle.properties`` with contents like:
``` ```
vcProtobufInclude=C:\\path\\to\\protobuf-3.7.1\\src vcProtobufInclude=C:\\path\\to\\protobuf-3.9.0\\src
vcProtobufLibs=C:\\path\\to\\protobuf-3.7.1\\vsprojects\\Release vcProtobufLibs=C:\\path\\to\\protobuf-3.9.0\\vsprojects\\Release
targetArch=x86_32 targetArch=x86_32
``` ```

4
README.md
View File

@ -102,7 +102,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
<artifactId>protobuf-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.1</version> <version>0.5.1</version>
<configuration> <configuration>
<protocArtifact>com.google.protobuf:protoc:3.7.1:exe:${os.detected.classifier}</protocArtifact> <protocArtifact>com.google.protobuf:protoc:3.9.0:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.22.1:exe:${os.detected.classifier}</pluginArtifact> <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.22.1:exe:${os.detected.classifier}</pluginArtifact>
</configuration> </configuration>
@ -137,7 +137,7 @@ buildscript {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:3.7.1" artifact = "com.google.protobuf:protoc:3.9.0"
} }
plugins { plugins {
grpc { grpc {

3
WORKSPACE
View File

@ -3,3 +3,6 @@ workspace(name = "io_grpc_grpc_java")
load("//:repositories.bzl", "grpc_java_repositories") load("//:repositories.bzl", "grpc_java_repositories")
grpc_java_repositories() grpc_java_repositories()
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
protobuf_deps()

2
android-interop-testing/app/build.gradle
View File

@ -39,7 +39,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
plugins { plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION

2
build.gradle
View File

@ -109,7 +109,7 @@ subprojects {
nettyVersion = '4.1.38.Final' nettyVersion = '4.1.38.Final'
googleauthVersion = '0.13.0' googleauthVersion = '0.13.0'
guavaVersion = '26.0-android' guavaVersion = '26.0-android'
protobufVersion = '3.7.1' protobufVersion = '3.9.0'
protocVersion = protobufVersion protocVersion = protobufVersion
opencensusVersion = '0.21.0' opencensusVersion = '0.21.0'

4
buildscripts/build_docker.sh
View File

@ -2,7 +2,7 @@
set -eu -o pipefail set -eu -o pipefail
readonly proto_dir="$(mktemp -d --tmpdir protobuf.XXXXXX)" readonly proto_dir="$(mktemp -d --tmpdir protobuf.XXXXXX)"
wget -O - https://github.com/google/protobuf/archive/v3.7.1.tar.gz | tar xz -C "$proto_dir" wget -O - https://github.com/google/protobuf/archive/v3.9.0.tar.gz | tar xz -C "$proto_dir"
docker build -t protoc-artifacts "$proto_dir"/protobuf-3.7.1/protoc-artifacts docker build -t protoc-artifacts "$proto_dir"/protobuf-3.9.0/protoc-artifacts
rm -r "$proto_dir" rm -r "$proto_dir"

2
buildscripts/kokoro/bazel.sh
View File

@ -3,7 +3,7 @@
set -exu -o pipefail set -exu -o pipefail
cat /VERSION cat /VERSION
use_bazel.sh 0.23.1 use_bazel.sh 0.28.1
bazel version bazel version
cd github/grpc-java cd github/grpc-java

2
buildscripts/make_dependencies.bat
View File

@ -1,4 +1,4 @@
set PROTOBUF_VER=3.7.1 set PROTOBUF_VER=3.9.0
set CMAKE_NAME=cmake-3.3.2-win32-x86 set CMAKE_NAME=cmake-3.3.2-win32-x86
if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" ( if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" (

2
buildscripts/make_dependencies.sh
View File

@ -3,7 +3,7 @@
# Build protoc # Build protoc
set -evux -o pipefail set -evux -o pipefail
PROTOBUF_VERSION=3.7.1 PROTOBUF_VERSION=3.9.0
# ARCH is 64 bit unless otherwise specified. # ARCH is 64 bit unless otherwise specified.
ARCH="${ARCH:-64}" ARCH="${ARCH:-64}"

5
examples/WORKSPACE
View File

@ -13,6 +13,8 @@ local_repository(
load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories") load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")
maven_jar( maven_jar(
name = "com_google_api_grpc_cloud_pubsub_v1", name = "com_google_api_grpc_cloud_pubsub_v1",
artifact = "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24", artifact = "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24",
@ -28,3 +30,6 @@ maven_jar(
grpc_java_repositories() grpc_java_repositories()
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
protobuf_deps()

2
examples/android/helloworld/app/build.gradle
View File

@ -27,7 +27,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
plugins { plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION

2
examples/android/routeguide/app/build.gradle
View File

@ -26,7 +26,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
plugins { plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION

2
examples/android/strictmode/app/build.gradle
View File

@ -27,7 +27,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.7.0' } protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
plugins { plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION

2
examples/build.gradle
View File

@ -22,7 +22,7 @@ targetCompatibility = 1.7
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.7.1' def protobufVersion = '3.9.0'
def protocVersion = protobufVersion def protocVersion = protobufVersion
dependencies { dependencies {

2
examples/example-alts/build.gradle
View File

@ -23,7 +23,7 @@ targetCompatibility = 1.7
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.7.1' def protocVersion = '3.9.0'
dependencies { dependencies {
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub // grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub

2
examples/example-gauth/build.gradle
View File

@ -23,7 +23,7 @@ targetCompatibility = 1.7
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.7.1' def protobufVersion = '3.9.0'
def protocVersion = protobufVersion def protocVersion = protobufVersion

2
examples/example-gauth/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.23.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.23.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.7.1</protobuf.version> <protobuf.version>3.9.0</protobuf.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>

2
examples/example-kotlin/android/helloworld/app/build.gradle
View File

@ -49,7 +49,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
plugins { plugins {
javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } javalite { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" }
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION

2
examples/example-kotlin/build.gradle
View File

@ -41,7 +41,7 @@ dependencies {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } protoc { artifact = 'com.google.protobuf:protoc:3.9.0' }
plugins { plugins {
grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" } grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" }
} }

2
examples/example-tls/build.gradle
View File

@ -24,7 +24,7 @@ targetCompatibility = 1.7
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def nettyTcNativeVersion = '2.0.25.Final' def nettyTcNativeVersion = '2.0.25.Final'
def protocVersion = '3.7.1' def protocVersion = '3.9.0'
dependencies { dependencies {
implementation "io.grpc:grpc-netty:${grpcVersion}" implementation "io.grpc:grpc-netty:${grpcVersion}"

2
examples/example-tls/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.23.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.23.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.7.1</protoc.version> <protoc.version>3.9.0</protoc.version>
<netty.tcnative.version>2.0.25.Final</netty.tcnative.version> <netty.tcnative.version>2.0.25.Final</netty.tcnative.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>

4
examples/pom.xml
View File

@ -13,8 +13,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.23.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.23.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.7.1</protobuf.version> <protobuf.version>3.9.0</protobuf.version>
<protoc.version>3.7.1</protoc.version> <protoc.version>3.9.0</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>

10
repositories.bzl
View File

@ -125,10 +125,6 @@ def grpc_java_repositories(
name = "gson", name = "gson",
actual = "@com_google_code_gson_gson//jar", actual = "@com_google_code_gson_gson//jar",
) )
native.bind(
name = "zlib",
actual = "@net_zlib//:zlib",
)
native.bind( native.bind(
name = "error_prone_annotations", name = "error_prone_annotations",
actual = "@com_google_errorprone_error_prone_annotations//jar", actual = "@com_google_errorprone_error_prone_annotations//jar",
@ -239,9 +235,9 @@ def com_google_protobuf():
# This statement defines the @com_google_protobuf repo. # This statement defines the @com_google_protobuf repo.
http_archive( http_archive(
name = "com_google_protobuf", name = "com_google_protobuf",
sha256 = "f976a4cd3f1699b6d20c1e944ca1de6754777918320c719742e1674fcf247b7e", sha256 = "8eb5ca331ab8ca0da2baea7fc0607d86c46c80845deca57109a5d637ccb93bb4",
strip_prefix = "protobuf-3.7.1", strip_prefix = "protobuf-3.9.0",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.7.1.zip"], urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.0.zip"],
) )
def com_google_protobuf_javalite(): def com_google_protobuf_javalite():