Skip to content

Commit c8bf140

Browse files
authored
Update tonic to 0.14 (#3579)
1 parent 8df8047 commit c8bf140

File tree

6 files changed

+125
-31
lines changed

6 files changed

+125
-31
lines changed

nym-vpn-core/Cargo.lock

Lines changed: 96 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nym-vpn-core/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ objc2-foundation = "0.3.1"
140140
once_cell = "1.21"
141141
pfctl = "0.7.0"
142142
pnet_packet = "0.35.0"
143-
prost = "0.13.5"
144-
prost-types = "0.13.5"
143+
prost = "0.14.1"
144+
prost-types = "0.14.1"
145145
pretty_assertions = "1.4.1"
146146
quinn = "0.11"
147147
quinn-proto = "0.11"
@@ -176,8 +176,9 @@ tokio-rustls = { version = "0.26", default-features = false }
176176
tokio-stream = "0.1.17"
177177
tokio-util = { version = "0.7.16", features = ["codec"] }
178178
toml = "0.9.5"
179-
tonic = "0.13.1"
180-
tonic-build = "0.13.1"
179+
tonic = "0.14.2"
180+
tonic-prost = "0.14.2"
181+
tonic-prost-build = "0.14.2"
181182
typed-builder = "0.21"
182183
tower = "0.5.2"
183184
tracing = "0.1"

nym-vpn-core/crates/nym-vpn-lib/Cargo.toml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,27 @@ nym-wg-go = { workspace = true, features = ["amnezia"] }
8484
nym-wg-metadata-client.workspace = true
8585
nym-platform-metadata.workspace = true
8686

87-
ed25519-dalek = { workspace = true, features = ["pkcs8", "alloc", "pem", "rand_core"]}
87+
ed25519-dalek = { workspace = true, features = [
88+
"pkcs8",
89+
"alloc",
90+
"pem",
91+
"rand_core",
92+
] }
8893
quinn.workspace = true
89-
rustls = { workspace = true, default-features = false, features = ["std", "ring", "logging"] }
94+
rustls = { workspace = true, default-features = false, features = [
95+
"std",
96+
"ring",
97+
"logging",
98+
] }
9099
rustls-pki-types.workspace = true
91-
tokio-rustls = { workspace = true, features = ["ring", "tls12", "logging"], default-features=false}
92-
quinn-proto.workspace =true
93-
rcgen.workspace =true
94-
webpki-roots.workspace =true
100+
tokio-rustls = { workspace = true, features = [
101+
"ring",
102+
"tls12",
103+
"logging",
104+
], default-features = false }
105+
quinn-proto.workspace = true
106+
rcgen.workspace = true
107+
webpki-roots.workspace = true
95108
x509-parser = { workspace = true, features = ["verify"] }
96109
bs58.workspace = true
97110
base64.workspace = true

nym-vpn-core/crates/nym-vpn-proto/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ workspace = true
1414
[dependencies]
1515
prost-types.workspace = true
1616
prost.workspace = true
17+
tonic-prost.workspace = true
1718
tonic.workspace = true
1819

1920
nym-config = { workspace = true, optional = true }
@@ -31,7 +32,7 @@ time = { workspace = true, optional = true }
3132
url = { workspace = true, optional = true }
3233

3334
[build-dependencies]
34-
tonic-build.workspace = true
35+
tonic-prost-build.workspace = true
3536

3637
[features]
3738
default = []

nym-vpn-core/crates/nym-vpn-proto/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// SPDX-License-Identifier: GPL-3.0-only
33

44
fn main() -> std::io::Result<()> {
5-
tonic_build::compile_protos("proto/nym_vpn_service.proto")
5+
tonic_prost_build::compile_protos("proto/nym_vpn_service.proto")
66
}

nym-vpn-core/crates/nym-vpn-proto/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
pub mod proto {
55
pub use prost_types::Timestamp;
6+
// remove when this bug is resolved: https://github.com/hyperium/tonic/issues/2388
7+
use std::primitive::bool;
68

79
tonic::include_proto!("nym_vpn_service");
810
}

0 commit comments

Comments
 (0)