From dc3be101411d00639381f9e9e39bcd98831815cd Mon Sep 17 00:00:00 2001 From: "P. Oscar Boykin" Date: Wed, 4 Oct 2023 15:17:11 -1000 Subject: [PATCH] Bump Prost and Tonic (#934) Co-authored-by: Oscar Boykin --- Cargo.lock | 49 ++++++++++++++++---------------- bazelfe-bazel-wrapper/Cargo.toml | 6 ++-- bazelfe-core/Cargo.toml | 6 ++-- bazelfe-protos/Cargo.toml | 8 +++--- bzl-remote-core/Cargo.toml | 6 ++-- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96c707456..d28e8da78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2402,12 +2402,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.23" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 1.0.107", + "syn 2.0.28", ] [[package]] @@ -2421,9 +2421,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", "prost-derive", @@ -2431,44 +2431,44 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck", "itertools", - "lazy_static", "log", "multimap", + "once_cell", "petgraph", "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.107", + "syn 2.0.28", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.28", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ "prost", ] @@ -2688,9 +2688,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -3211,9 +3211,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", @@ -3296,17 +3296,15 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", "axum", "base64", "bytes", - "futures-core", - "futures-util", "h2", "http", "http-body", @@ -3315,6 +3313,7 @@ dependencies = [ "percent-encoding", "pin-project", "prost", + "rustls", "rustls-pemfile", "tokio", "tokio-rustls", @@ -3327,15 +3326,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", "prost-build", "quote", - "syn 1.0.107", + "syn 2.0.28", ] [[package]] diff --git a/bazelfe-bazel-wrapper/Cargo.toml b/bazelfe-bazel-wrapper/Cargo.toml index d9372366f..1b41bdad7 100644 --- a/bazelfe-bazel-wrapper/Cargo.toml +++ b/bazelfe-bazel-wrapper/Cargo.toml @@ -19,8 +19,8 @@ ctrlc = "3.4.1" clap = { version = "4.4.6", features = ["derive", "env"] } lazy_static = "1.4.0" log = "0.4.20" -prost = "0.11.9" -prost-types = "0.11.9" +prost = "0.12.1" +prost-types = "0.12.1" rand = "0.8.5" serde = { version = "1.0.188", features = ["derive"] } thiserror = "1.0.49" @@ -65,7 +65,7 @@ version = "0.1.14" [dependencies.tonic] features = ["tls"] -version = "0.9.2" +version = "0.10.2" [dev-dependencies] once_cell = "1.18.0" diff --git a/bazelfe-core/Cargo.toml b/bazelfe-core/Cargo.toml index cc335f9e8..4ef536d88 100644 --- a/bazelfe-core/Cargo.toml +++ b/bazelfe-core/Cargo.toml @@ -58,8 +58,8 @@ log = "0.4.20" nom = "7.1.3" openssl = { version = "0.10.57", features = ["vendored"] } pretty_env_logger = "0.5.0" -prost = "0.11.9" -prost-types = "0.11.9" +prost = "0.12.1" +prost-types = "0.12.1" rand = "0.8.5" regex = "1.9.6" serde = { version = "1.0.188", features = ["derive"] } @@ -119,7 +119,7 @@ version = "0.1.14" [dependencies.tonic] features = ["tls"] -version = "0.9.2" +version = "0.10.2" [dev-dependencies] once_cell = "1.18.0" diff --git a/bazelfe-protos/Cargo.toml b/bazelfe-protos/Cargo.toml index 07a4db1f5..4c18e5c95 100644 --- a/bazelfe-protos/Cargo.toml +++ b/bazelfe-protos/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tonic = { version = "0.9.2", features = ["tls"] } -prost = "0.11.9" +tonic = { version = "0.10.2", features = ["tls"] } +prost = "0.12.1" # Required for wellknown types -prost-types = "0.11.9" +prost-types = "0.12.1" sha2 = "0.10.8" thiserror = "1.0.49" openssl = { version = "0.10.57", features = ["vendored"] } @@ -19,7 +19,7 @@ features = ["full"] version = "1.32.0" [build-dependencies] -tonic-build = { version = "0.9.2", features = ["prost"] } +tonic-build = { version = "0.10.2", features = ["prost"] } [dev-dependencies] diff --git a/bzl-remote-core/Cargo.toml b/bzl-remote-core/Cargo.toml index 832a9c8ca..3166fabe3 100644 --- a/bzl-remote-core/Cargo.toml +++ b/bzl-remote-core/Cargo.toml @@ -29,8 +29,8 @@ tracing = "0.1.38" tracing-attributes = "0.1" tracing-appender = "0.2" tracing-subscriber = { version = "0.3", features = ["tracing-log", "env-filter"] } -prost = "0.11.9" -prost-types = "0.11.9" +prost = "0.12.1" +prost-types = "0.12.1" rand = "0.8.5" regex = "1.9.6" serde = { version = "1.0.188", features = ["derive"] } @@ -84,7 +84,7 @@ version = "0.1.14" [dependencies.tonic] features = ["tls"] -version = "0.9.2" +version = "0.10.2" [dev-dependencies] once_cell = "1.18.0"