diff --git a/COMPILING.md b/COMPILING.md index 7e74338d50..865861f1ce 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -44,7 +44,7 @@ For Linux, Mac and MinGW: ``` $ git clone https://github.com/google/protobuf.git $ cd protobuf -$ git checkout v3.7.1 +$ git checkout v3.9.0 $ ./autogen.sh $ ./configure --disable-shared $ make @@ -83,16 +83,16 @@ When building on Windows and VC++, you need to specify project properties for Gradle to find protobuf: ``` .\gradlew publishToMavenLocal ^ - -PvcProtobufInclude=C:\path\to\protobuf-3.7.1\src ^ - -PvcProtobufLibs=C:\path\to\protobuf-3.7.1\vsprojects\Release ^ + -PvcProtobufInclude=C:\path\to\protobuf-3.9.0\src ^ + -PvcProtobufLibs=C:\path\to\protobuf-3.9.0\vsprojects\Release ^ -PtargetArch=x86_32 ``` Since specifying those properties every build is bothersome, you can instead create ``\gradle.properties`` with contents like: ``` -vcProtobufInclude=C:\\path\\to\\protobuf-3.7.1\\src -vcProtobufLibs=C:\\path\\to\\protobuf-3.7.1\\vsprojects\\Release +vcProtobufInclude=C:\\path\\to\\protobuf-3.9.0\\src +vcProtobufLibs=C:\\path\\to\\protobuf-3.9.0\\vsprojects\\Release targetArch=x86_32 ``` diff --git a/README.md b/README.md index a78ace166f..e6dbe06084 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use protobuf-maven-plugin 0.5.1 - com.google.protobuf:protoc:3.7.1:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.9.0:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:1.22.1:exe:${os.detected.classifier} @@ -137,7 +137,7 @@ buildscript { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.7.1" + artifact = "com.google.protobuf:protoc:3.9.0" } plugins { grpc { diff --git a/WORKSPACE b/WORKSPACE index 65bf26a8b2..a347e1233f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,3 +3,6 @@ workspace(name = "io_grpc_grpc_java") load("//:repositories.bzl", "grpc_java_repositories") grpc_java_repositories() + +load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") +protobuf_deps() diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle index eb3c91749a..47b477a4ba 100644 --- a/android-interop-testing/app/build.gradle +++ b/android-interop-testing/app/build.gradle @@ -39,7 +39,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } + protoc { artifact = 'com.google.protobuf:protoc:3.9.0' } plugins { 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 diff --git a/build.gradle b/build.gradle index d59ec2a942..2a1227db33 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,7 @@ subprojects { nettyVersion = '4.1.38.Final' googleauthVersion = '0.13.0' guavaVersion = '26.0-android' - protobufVersion = '3.7.1' + protobufVersion = '3.9.0' protocVersion = protobufVersion opencensusVersion = '0.21.0' diff --git a/buildscripts/build_docker.sh b/buildscripts/build_docker.sh index 9ecb223e72..105f412660 100755 --- a/buildscripts/build_docker.sh +++ b/buildscripts/build_docker.sh @@ -2,7 +2,7 @@ set -eu -o pipefail 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" diff --git a/buildscripts/kokoro/bazel.sh b/buildscripts/kokoro/bazel.sh index 083bf7cc02..ec9f4486ec 100755 --- a/buildscripts/kokoro/bazel.sh +++ b/buildscripts/kokoro/bazel.sh @@ -3,7 +3,7 @@ set -exu -o pipefail cat /VERSION -use_bazel.sh 0.23.1 +use_bazel.sh 0.28.1 bazel version cd github/grpc-java diff --git a/buildscripts/make_dependencies.bat b/buildscripts/make_dependencies.bat index 48bd813757..32783be493 100644 --- a/buildscripts/make_dependencies.bat +++ b/buildscripts/make_dependencies.bat @@ -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 if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" ( diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh index 779ad14167..2e2bb8ff83 100755 --- a/buildscripts/make_dependencies.sh +++ b/buildscripts/make_dependencies.sh @@ -3,7 +3,7 @@ # Build protoc set -evux -o pipefail -PROTOBUF_VERSION=3.7.1 +PROTOBUF_VERSION=3.9.0 # ARCH is 64 bit unless otherwise specified. ARCH="${ARCH:-64}" diff --git a/examples/WORKSPACE b/examples/WORKSPACE index c8983c54ba..8e358de2a3 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -13,6 +13,8 @@ local_repository( load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories") + + maven_jar( name = "com_google_api_grpc_cloud_pubsub_v1", artifact = "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24", @@ -28,3 +30,6 @@ maven_jar( grpc_java_repositories() + +load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") +protobuf_deps() diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 45b395cf90..b6079dad1c 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -27,7 +27,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } + protoc { artifact = 'com.google.protobuf:protoc:3.9.0' } plugins { 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 diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index dd7316882a..0c60db2b74 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -26,7 +26,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } + protoc { artifact = 'com.google.protobuf:protoc:3.9.0' } plugins { 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 diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle index 3e86c2126d..c6141f275b 100644 --- a/examples/android/strictmode/app/build.gradle +++ b/examples/android/strictmode/app/build.gradle @@ -27,7 +27,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.7.0' } + protoc { artifact = 'com.google.protobuf:protoc:3.9.0' } plugins { 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 diff --git a/examples/build.gradle b/examples/build.gradle index 10feccb73d..a43089ce69 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -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.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.7.1' +def protobufVersion = '3.9.0' def protocVersion = protobufVersion dependencies { diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 776dcf77e4..09d6a96f61 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -23,7 +23,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.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.7.1' +def protocVersion = '3.9.0' dependencies { // grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 80beb1a0e9..46e3471af9 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -23,7 +23,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.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.7.1' +def protobufVersion = '3.9.0' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index f65dd326b4..badbc0b832 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.23.0-SNAPSHOT - 3.7.1 + 3.9.0 1.7 1.7 diff --git a/examples/example-kotlin/android/helloworld/app/build.gradle b/examples/example-kotlin/android/helloworld/app/build.gradle index d5b271381c..77e6529e00 100644 --- a/examples/example-kotlin/android/helloworld/app/build.gradle +++ b/examples/example-kotlin/android/helloworld/app/build.gradle @@ -49,7 +49,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } + protoc { artifact = 'com.google.protobuf:protoc:3.9.0' } plugins { 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 diff --git a/examples/example-kotlin/build.gradle b/examples/example-kotlin/build.gradle index 71162538aa..a6a1608a7a 100644 --- a/examples/example-kotlin/build.gradle +++ b/examples/example-kotlin/build.gradle @@ -41,7 +41,7 @@ dependencies { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.7.1' } + protoc { artifact = 'com.google.protobuf:protoc:3.9.0' } plugins { grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" } } diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 45d76deedc..72de618f5f 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -24,7 +24,7 @@ targetCompatibility = 1.7 // updating the version in our release process. def grpcVersion = '1.23.0-SNAPSHOT' // CURRENT_GRPC_VERSION def nettyTcNativeVersion = '2.0.25.Final' -def protocVersion = '3.7.1' +def protocVersion = '3.9.0' dependencies { implementation "io.grpc:grpc-netty:${grpcVersion}" diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index c2e25d12ee..80b7be5116 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.23.0-SNAPSHOT - 3.7.1 + 3.9.0 2.0.25.Final 1.7 diff --git a/examples/pom.xml b/examples/pom.xml index c3565a1bd9..42f0f19d17 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -13,8 +13,8 @@ UTF-8 1.23.0-SNAPSHOT - 3.7.1 - 3.7.1 + 3.9.0 + 3.9.0 1.7 1.7 diff --git a/repositories.bzl b/repositories.bzl index 4606e0d661..53bc745823 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -125,10 +125,6 @@ def grpc_java_repositories( name = "gson", actual = "@com_google_code_gson_gson//jar", ) - native.bind( - name = "zlib", - actual = "@net_zlib//:zlib", - ) native.bind( name = "error_prone_annotations", actual = "@com_google_errorprone_error_prone_annotations//jar", @@ -239,9 +235,9 @@ def com_google_protobuf(): # This statement defines the @com_google_protobuf repo. http_archive( name = "com_google_protobuf", - sha256 = "f976a4cd3f1699b6d20c1e944ca1de6754777918320c719742e1674fcf247b7e", - strip_prefix = "protobuf-3.7.1", - urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.7.1.zip"], + sha256 = "8eb5ca331ab8ca0da2baea7fc0607d86c46c80845deca57109a5d637ccb93bb4", + strip_prefix = "protobuf-3.9.0", + urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.0.zip"], ) def com_google_protobuf_javalite():