mirror of https://github.com/grpc/grpc-java.git
Bump protobuf to 3.19.2
This commit is contained in:
parent
86b8b265ba
commit
80c3be0f80
|
@ -43,11 +43,11 @@ This section is only necessary if you are making changes to the code
|
|||
generation. Most users only need to use `skipCodegen=true` as discussed above.
|
||||
|
||||
### Build Protobuf
|
||||
The codegen plugin is C++ code and requires protobuf 3.19.1 or later.
|
||||
The codegen plugin is C++ code and requires protobuf 3.19.2 or later.
|
||||
|
||||
For Linux, Mac and MinGW:
|
||||
```
|
||||
$ PROTOBUF_VERSION=3.19.1
|
||||
$ PROTOBUF_VERSION=3.19.2
|
||||
$ curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/protobuf-all-$PROTOBUF_VERSION.tar.gz
|
||||
$ tar xzf protobuf-all-$PROTOBUF_VERSION.tar.gz
|
||||
$ cd protobuf-$PROTOBUF_VERSION
|
||||
|
|
|
@ -57,7 +57,7 @@ subprojects {
|
|||
nettyVersion = '4.1.63.Final'
|
||||
guavaVersion = '30.1.1-android'
|
||||
googleauthVersion = '0.22.2'
|
||||
protobufVersion = '3.19.1'
|
||||
protobufVersion = '3.19.2'
|
||||
protocVersion = protobufVersion
|
||||
opencensusVersion = '0.28.0'
|
||||
autovalueVersion = '1.7.4'
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
set PROTOBUF_VER=3.19.1
|
||||
set PROTOBUF_VER=3.19.2
|
||||
set CMAKE_NAME=cmake-3.3.2-win32-x86
|
||||
|
||||
if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" (
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Build protoc
|
||||
set -evux -o pipefail
|
||||
|
||||
PROTOBUF_VERSION=3.19.1
|
||||
PROTOBUF_VERSION=3.19.2
|
||||
|
||||
# ARCH is x86_64 bit unless otherwise specified.
|
||||
ARCH="${ARCH:-x86_64}"
|
||||
|
|
|
@ -32,7 +32,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.1' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.2' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.1' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.2' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.1' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.2' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.1' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.19.2' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
@ -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.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.19.1'
|
||||
def protobufVersion = '3.19.2'
|
||||
def protocVersion = protobufVersion
|
||||
|
||||
dependencies {
|
||||
|
|
|
@ -24,7 +24,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.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.19.1'
|
||||
def protocVersion = '3.19.2'
|
||||
|
||||
dependencies {
|
||||
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub
|
||||
|
|
|
@ -24,7 +24,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.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.19.1'
|
||||
def protobufVersion = '3.19.2'
|
||||
def protocVersion = protobufVersion
|
||||
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.44.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protobuf.version>3.19.1</protobuf.version>
|
||||
<protobuf.version>3.19.2</protobuf.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
|
|
|
@ -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.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.19.1'
|
||||
def protobufVersion = '3.19.2'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.44.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protoc.version>3.19.1</protoc.version>
|
||||
<protoc.version>3.19.2</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
|
|
|
@ -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.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.19.1'
|
||||
def protobufVersion = '3.19.2'
|
||||
def protocVersion = protobufVersion
|
||||
|
||||
dependencies {
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.44.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protobuf.version>3.19.1</protobuf.version>
|
||||
<protoc.version>3.19.1</protoc.version>
|
||||
<protobuf.version>3.19.2</protobuf.version>
|
||||
<protoc.version>3.19.2</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
|
|
|
@ -24,7 +24,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.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.19.1'
|
||||
def protocVersion = '3.19.2'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.44.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protoc.version>3.19.1</protoc.version>
|
||||
<protoc.version>3.19.2</protoc.version>
|
||||
<netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
|
|
|
@ -24,7 +24,7 @@ targetCompatibility = 1.7
|
|||
// updating the version in our release process.
|
||||
def grpcVersion = '1.44.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def nettyTcNativeVersion = '2.0.31.Final'
|
||||
def protocVersion = '3.19.1'
|
||||
def protocVersion = '3.19.2'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.44.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protobuf.version>3.19.1</protobuf.version>
|
||||
<protoc.version>3.19.1</protoc.version>
|
||||
<protobuf.version>3.19.2</protobuf.version>
|
||||
<protoc.version>3.19.2</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
|
|
|
@ -98,18 +98,18 @@ def com_google_protobuf():
|
|||
# This statement defines the @com_google_protobuf repo.
|
||||
http_archive(
|
||||
name = "com_google_protobuf",
|
||||
sha256 = "25f1292d4ea6666f460a2a30038eef121e6c3937ae0f61d610611dfb14b0bd32",
|
||||
strip_prefix = "protobuf-3.19.1",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.19.1.zip"],
|
||||
sha256 = "9ceef0daf7e8be16cd99ac759271eb08021b53b1c7b6edd399953a76390234cd",
|
||||
strip_prefix = "protobuf-3.19.2",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.19.2.zip"],
|
||||
)
|
||||
|
||||
def com_google_protobuf_javalite():
|
||||
# java_lite_proto_library rules implicitly depend on @com_google_protobuf_javalite
|
||||
http_archive(
|
||||
name = "com_google_protobuf_javalite",
|
||||
sha256 = "25f1292d4ea6666f460a2a30038eef121e6c3937ae0f61d610611dfb14b0bd32",
|
||||
strip_prefix = "protobuf-3.19.1",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.19.1.zip"],
|
||||
sha256 = "9ceef0daf7e8be16cd99ac759271eb08021b53b1c7b6edd399953a76390234cd",
|
||||
strip_prefix = "protobuf-3.19.2",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.19.2.zip"],
|
||||
)
|
||||
|
||||
def io_grpc_grpc_proto():
|
||||
|
|
Loading…
Reference in New Issue