From d037d0eebc552ab39b4fc2ab5f8a6f06af92b2aa Mon Sep 17 00:00:00 2001 From: Alex Butler Date: Thu, 7 Sep 2023 11:54:15 +0100 Subject: [PATCH 1/2] Update prost to 0.12 Signed-off-by: Alex Butler --- CHANGELOG.md | 4 ++++ Cargo.toml | 6 +++--- compiler/Cargo.toml | 4 ++-- health/Cargo.toml | 6 +++--- proto/Cargo.toml | 6 +++--- tests-and-examples/Cargo.toml | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d7e4e10..b0390bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# Unreleased (0.14.0) + +- Update prost to 0.12 (#631) + # 0.13.0 - 2023-08-17 - Publicize prost service generator (#612) diff --git a/Cargo.toml b/Cargo.toml index 2334a424..bcf075e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio" -version = "0.13.0" +version = "0.14.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -23,7 +23,7 @@ futures-executor = "0.3" futures-util = { version = "0.3", default-features = false, features = ["std", "sink"] } protobuf = { version = "2.0", optional = true } protobufv3 = { package = "protobuf", version = "3.2", optional = true } -prost = { version = "0.11", optional = true } +prost = { version = "0.12", optional = true } bytes = { version = "1.0", optional = true } log = "0.4" parking_lot = "0.12" @@ -57,4 +57,4 @@ no-omit-frame-pointer = ["grpcio-sys/no-omit-frame-pointer"] travis-ci = { repository = "tikv/grpc-rs" } [patch.crates-io] -grpcio-compiler = { path = "compiler", version = "0.13.0" } +grpcio-compiler = { path = "compiler", version = "0.14.0" } diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 622443cf..69b2f8f5 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-compiler" -version = "0.13.0" +version = "0.14.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -18,7 +18,7 @@ prost-codec = ["prost-build", "prost-types", "prost", "derive-new", "tempfile"] [dependencies] protobuf = { version = "2", optional = true } -prost = { version = "0.11", optional = true } +prost = { version = "0.12", optional = true } prost-build = { version = "0.11", optional = true } prost-types = { version = "0.11", optional = true } derive-new = { version = "0.5", optional = true } diff --git a/health/Cargo.toml b/health/Cargo.toml index 959b58e8..a9eaba04 100644 --- a/health/Cargo.toml +++ b/health/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-health" -version = "0.13.0" +version = "0.14.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -21,8 +21,8 @@ prost-codec = ["grpcio/prost-codec", "prost"] [dependencies] futures-executor = "0.3" futures-util = { version = "0.3", default-features = false, features = ["std"] } -grpcio = { path = "..", version = "0.13.0", default-features = false } -prost = { version = "0.11", optional = true } +grpcio = { path = "..", version = "0.14", default-features = false } +prost = { version = "0.12", optional = true } protobuf = { version = "2", optional = true } protobufv3 = { package = "protobuf", version = "3.2", optional = true } log = "0.4" diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 8cd72d38..bf8c4b24 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-proto" -version = "0.13.0" +version = "0.14.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -18,9 +18,9 @@ protobufv3-codec = ["grpcio/protobufv3-codec", "protobufv3"] prost-codec = ["prost-build", "prost-derive", "prost-types", "bytes", "lazy_static", "grpcio/prost-codec", "prost"] [dependencies] -grpcio = { path = "..", features = ["boringssl"], version = "0.13.0", default-features = false } +grpcio = { path = "..", features = ["boringssl"], version = "0.14", default-features = false } bytes = { version = "1.0", optional = true } -prost = { version = "0.11", optional = true } +prost = { version = "0.12", optional = true } prost-derive = { version = "0.11", optional = true } prost-types = { version = "0.11", optional = true } protobuf = { version = "2", optional = true } diff --git a/tests-and-examples/Cargo.toml b/tests-and-examples/Cargo.toml index ed53a552..17e8a5d9 100644 --- a/tests-and-examples/Cargo.toml +++ b/tests-and-examples/Cargo.toml @@ -20,7 +20,7 @@ futures-util = { version = "0.3", features = ["sink"] } futures-timer = "3.0" protobuf = { version = "2", optional = true } protobufv3 = { package = "protobuf", version = "3.2", optional = true } -prost = { version = "0.11", optional = true } +prost = { version = "0.12", optional = true } bytes = { version = "1.0", optional = true } log = "0.4" grpcio = { path = "..", default-features = false, features = ["boringssl"] } From fbaf805d4740da9f0725ecacd2da7aee6467e3df Mon Sep 17 00:00:00 2001 From: Alex Butler Date: Fri, 8 Sep 2023 09:09:39 +0100 Subject: [PATCH 2/2] up other prost crates to 0.12 Signed-off-by: Alex Butler --- compiler/Cargo.toml | 4 ++-- proto/Cargo.toml | 6 +++--- xtask/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 69b2f8f5..81f6435c 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -19,8 +19,8 @@ prost-codec = ["prost-build", "prost-types", "prost", "derive-new", "tempfile"] [dependencies] protobuf = { version = "2", optional = true } prost = { version = "0.12", optional = true } -prost-build = { version = "0.11", optional = true } -prost-types = { version = "0.11", optional = true } +prost-build = { version = "0.12", optional = true } +prost-types = { version = "0.12", optional = true } derive-new = { version = "0.5", optional = true } tempfile = { version = "3.0", optional = true } diff --git a/proto/Cargo.toml b/proto/Cargo.toml index bf8c4b24..8af9d0b7 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -21,12 +21,12 @@ prost-codec = ["prost-build", "prost-derive", "prost-types", "bytes", "lazy_stat grpcio = { path = "..", features = ["boringssl"], version = "0.14", default-features = false } bytes = { version = "1.0", optional = true } prost = { version = "0.12", optional = true } -prost-derive = { version = "0.11", optional = true } -prost-types = { version = "0.11", optional = true } +prost-derive = { version = "0.12", optional = true } +prost-types = { version = "0.12", optional = true } protobuf = { version = "2", optional = true } protobufv3 = { package = "protobuf", version = "3.2", optional = true } lazy_static = { version = "1.3", optional = true } [build-dependencies] -prost-build = { version = "0.11", optional = true } +prost-build = { version = "0.12", optional = true } walkdir = "2.2" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 571c7709..f98c8fec 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -prost-build = "0.11" +prost-build = "0.12" # Use an old enough version to make sure generated code with TiKV's fork. # TODO: use latest one when TiKV's fork is updated protoc-rust = "=2.8"