From ead0a31d902ece06ccfb846bcb289cd68b6b97f9 Mon Sep 17 00:00:00 2001 From: pingyu Date: Tue, 14 Sep 2021 01:04:36 +0800 Subject: [PATCH 1/2] update prost to 0.8 Signed-off-by: pingyu --- Cargo.toml | 6 +++--- compiler/Cargo.toml | 8 ++++---- health/Cargo.toml | 6 +++--- proto/Cargo.toml | 10 +++++----- tests-and-examples/Cargo.toml | 8 ++++---- xtask/Cargo.toml | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6fecf280..7a516bfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio" -version = "0.9.0" +version = "0.10.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -21,7 +21,7 @@ grpcio-sys = { path = "grpc-sys", version = "0.9", default-features = false } libc = "0.2" futures = "0.3" protobuf = { version = "2.0", optional = true } -prost = { version = "0.7", optional = true } +prost = { version = "0.8", optional = true } bytes = { version = "1.0", optional = true } log = "0.4" parking_lot = "0.11" @@ -53,4 +53,4 @@ use-bindgen = ["grpcio-sys/use-bindgen"] travis-ci = { repository = "tikv/grpc-rs" } [patch.crates-io] -grpcio-compiler = { path = "compiler", version = "0.9.0", default-features = false } +grpcio-compiler = { path = "compiler", version = "0.10.0", default-features = false } diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 46c1e8b0..79ad77c5 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-compiler" -version = "0.9.0" +version = "0.10.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -18,9 +18,9 @@ prost-codec = ["prost-build", "prost-types", "prost", "derive-new", "tempfile"] [dependencies] protobuf = { version = "2", optional = true } -prost = { version = "0.7", optional = true } -prost-build = { version = "0.7", optional = true } -prost-types = { version = "0.7", optional = true } +prost = { version = "0.8", optional = true } +prost-build = { version = "0.8", optional = true } +prost-types = { version = "0.8", optional = true } derive-new = { version = "0.5", optional = true } tempfile = { version = "3.0", optional = true } diff --git a/health/Cargo.toml b/health/Cargo.toml index dbb53fc3..4b8b71c0 100644 --- a/health/Cargo.toml +++ b/health/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-health" -version = "0.9.0" +version = "0.10.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -20,7 +20,7 @@ use-bindgen = ["grpcio/use-bindgen"] [dependencies] futures = "0.3" -grpcio = { path = "..", features = ["secure"], version = "0.9.0", default-features = false } -prost = { version = "0.7", optional = true } +grpcio = { path = "..", features = ["secure"], version = "0.10.0", default-features = false } +prost = { version = "0.8", optional = true } protobuf = { version = "2", optional = true } log = "0.4" diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 18e15faa..e1ea93c8 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-proto" -version = "0.9.0" +version = "0.10.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -20,11 +20,11 @@ use-bindgen = ["grpcio/use-bindgen"] [dependencies] futures = "0.3" -grpcio = { path = "..", features = ["secure"], version = "0.9.0", default-features = false } +grpcio = { path = "..", features = ["secure"], version = "0.10.0", default-features = false } bytes = { version = "1.0", optional = true } -prost = { version = "0.7", optional = true } -prost-derive = { version = "0.7", optional = true } -prost-types = { version = "0.7", optional = true } +prost = { version = "0.8", optional = true } +prost-derive = { version = "0.8", optional = true } +prost-types = { version = "0.8", optional = true } protobuf = "2" lazy_static = { version = "1.3", optional = true } diff --git a/tests-and-examples/Cargo.toml b/tests-and-examples/Cargo.toml index 984e684f..99bbce62 100644 --- a/tests-and-examples/Cargo.toml +++ b/tests-and-examples/Cargo.toml @@ -16,17 +16,17 @@ libc = "0.2" futures = "0.3" futures-timer = "3.0" protobuf = { version = "2.22", optional = true } -prost = { version = "0.7", optional = true } +prost = { version = "0.8", optional = true } bytes = { version = "1.0", optional = true } log = "0.4" -grpcio = { path = "..", version = "0.9", default-features = false, features = ["secure"] } -grpcio-health = { path = "../health", version = "0.9", default-features = false } +grpcio = { path = "..", version = "0.10", default-features = false, features = ["secure"] } +grpcio-health = { path = "../health", version = "0.10", default-features = false } [dev-dependencies] serde_json = "1.0" serde = "1.0" serde_derive = "1.0" -grpcio-proto = { path = "../proto", version = "0.9.0", default-features = false } +grpcio-proto = { path = "../proto", version = "0.10.0", default-features = false } rand = "0.7" slog = "2.0" slog-async = "2.1" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 2ef2e354..b26186ff 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.7" +prost-build = "0.8" # 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" From 4ce6dfb229220a8c7ff374816e9943b0c74c43f6 Mon Sep 17 00:00:00 2001 From: pingyu Date: Tue, 21 Sep 2021 10:20:22 +0800 Subject: [PATCH 2/2] revert version Signed-off-by: pingyu --- Cargo.toml | 4 ++-- compiler/Cargo.toml | 2 +- health/Cargo.toml | 4 ++-- proto/Cargo.toml | 6 +++--- tests-and-examples/Cargo.toml | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7a516bfa..9ff37e34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio" -version = "0.10.0" +version = "0.9.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -53,4 +53,4 @@ use-bindgen = ["grpcio-sys/use-bindgen"] travis-ci = { repository = "tikv/grpc-rs" } [patch.crates-io] -grpcio-compiler = { path = "compiler", version = "0.10.0", default-features = false } +grpcio-compiler = { path = "compiler", version = "0.9.0", default-features = false } diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 79ad77c5..c5e6b0fa 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-compiler" -version = "0.10.0" +version = "0.9.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" diff --git a/health/Cargo.toml b/health/Cargo.toml index 4b8b71c0..771440e5 100644 --- a/health/Cargo.toml +++ b/health/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-health" -version = "0.10.0" +version = "0.9.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -20,7 +20,7 @@ use-bindgen = ["grpcio/use-bindgen"] [dependencies] futures = "0.3" -grpcio = { path = "..", features = ["secure"], version = "0.10.0", default-features = false } +grpcio = { path = "..", features = ["secure"], version = "0.9.0", default-features = false } prost = { version = "0.8", optional = true } protobuf = { version = "2", optional = true } log = "0.4" diff --git a/proto/Cargo.toml b/proto/Cargo.toml index e1ea93c8..f513cac2 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grpcio-proto" -version = "0.10.0" +version = "0.9.0" edition = "2018" authors = ["The TiKV Project Developers"] license = "Apache-2.0" @@ -20,7 +20,7 @@ use-bindgen = ["grpcio/use-bindgen"] [dependencies] futures = "0.3" -grpcio = { path = "..", features = ["secure"], version = "0.10.0", default-features = false } +grpcio = { path = "..", features = ["secure"], version = "0.9.0", default-features = false } bytes = { version = "1.0", optional = true } prost = { version = "0.8", optional = true } prost-derive = { version = "0.8", optional = true } @@ -29,5 +29,5 @@ protobuf = "2" lazy_static = { version = "1.3", optional = true } [build-dependencies] -protobuf-build = { version = "0.12", default-features = false } +protobuf-build = { version = ">=0.12", default-features = false } walkdir = "2.2" diff --git a/tests-and-examples/Cargo.toml b/tests-and-examples/Cargo.toml index 99bbce62..ed9c5305 100644 --- a/tests-and-examples/Cargo.toml +++ b/tests-and-examples/Cargo.toml @@ -19,14 +19,14 @@ protobuf = { version = "2.22", optional = true } prost = { version = "0.8", optional = true } bytes = { version = "1.0", optional = true } log = "0.4" -grpcio = { path = "..", version = "0.10", default-features = false, features = ["secure"] } -grpcio-health = { path = "../health", version = "0.10", default-features = false } +grpcio = { path = "..", version = "0.9", default-features = false, features = ["secure"] } +grpcio-health = { path = "../health", version = "0.9", default-features = false } [dev-dependencies] serde_json = "1.0" serde = "1.0" serde_derive = "1.0" -grpcio-proto = { path = "../proto", version = "0.10.0", default-features = false } +grpcio-proto = { path = "../proto", version = "0.9.0", default-features = false } rand = "0.7" slog = "2.0" slog-async = "2.1"