Update tokio

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2023-03-13 09:43:52 -07:00
parent 526b372ea7
commit 98754fd771
7 changed files with 23 additions and 16 deletions

View File

@ -21,3 +21,10 @@ license = "Apache-2.0"
repository = "https://github.com/containerd/rust-extensions" repository = "https://github.com/containerd/rust-extensions"
homepage = "https://containerd.io" homepage = "https://containerd.io"
edition = "2018" edition = "2018"
# Common crate dependencies
[workspace.dependencies]
tokio = "1.26"
tower = "0.4"
async-trait = "0.1.52"
futures = "0.3.19"

View File

@ -15,8 +15,8 @@ homepage.workspace = true
tonic = "0.8" tonic = "0.8"
prost = "0.11" prost = "0.11"
prost-types = "0.11" prost-types = "0.11"
tokio = { version = "1.18", optional = true } tokio = { workspace = true, optional = true }
tower = { version = "0.4", optional = true } tower = { workspace = true, optional = true }
# tonic v0.8.1 depends on axum-core v0.2.2, which has security vulnerability: # tonic v0.8.1 depends on axum-core v0.2.2, which has security vulnerability:
# = ID: RUSTSEC-2022-0055 # = ID: RUSTSEC-2022-0055

View File

@ -33,9 +33,9 @@ oci-spec = "0.6.0"
crossbeam = "0.8.1" crossbeam = "0.8.1"
# Async dependencies # Async dependencies
async-trait = { version = "0.1.51", optional = true } async-trait = { workspace = true, optional = true }
tokio = { version = "1.17.0", features = ["full"], optional = true } tokio = { workspace = true, features = ["full"], optional = true }
futures = { version = "0.3.21", optional = true } futures = { workspace = true, optional = true }
containerd-shim = { path = "../shim", version = "0.3.0" } containerd-shim = { path = "../shim", version = "0.3.0" }
runc = { path = "../runc", version = "0.2.0" } runc = { path = "../runc", version = "0.2.0" }

View File

@ -30,7 +30,7 @@ uuid = { version = "1.0.0", features = ["v4"] }
os_pipe = "1.0.0" os_pipe = "1.0.0"
# Async dependencies # Async dependencies
tokio = { version = "1.15.0", features = ["full"], optional = true } tokio = { workspace = true, features = ["full"], optional = true }
async-trait = { version = "0.1.52", optional = true } async-trait = { workspace = true, optional = true }
futures = { version = "0.3.19", optional = true } futures = { workspace = true, optional = true }
tokio-pipe = {version="0.2.10", optional = true } tokio-pipe = { version="0.2.10", optional = true }

View File

@ -23,7 +23,7 @@ ttrpc-codegen = "0.4"
ctrlc = { version = "3.0", features = ["termination"] } ctrlc = { version = "3.0", features = ["termination"] }
log = "0.4" log = "0.4"
simple_logger = { version = "4.0", default-features = false, features = ["stderr"] } simple_logger = { version = "4.0", default-features = false, features = ["stderr"] }
tokio = { version = "1.18", features = ["full"] } tokio = { workspace = true, features = ["full"] }
[features] [features]
default = [] default = []

View File

@ -38,10 +38,10 @@ regex = "1"
containerd-shim-protos = { path = "../shim-protos", version = "0.2.0" } containerd-shim-protos = { path = "../shim-protos", version = "0.2.0" }
async-trait = { version = "0.1.51", optional = true } async-trait = { workspace = true, optional = true }
tokio = { version = "1.17.0", features = ["full"], optional = true } tokio = { workspace = true, features = ["full"], optional = true }
futures = {version = "0.3.21", optional = true} futures = { workspace = true, optional = true}
signal-hook-tokio = {version = "0.3.1", optional = true, features = ["futures-v0_3"]} signal-hook-tokio = { version = "0.3.1", optional = true, features = ["futures-v0_3"]}
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
cgroups-rs = "0.2.9" cgroups-rs = "0.2.9"

View File

@ -16,7 +16,7 @@ thiserror = "1.0"
tonic = "0.8" tonic = "0.8"
prost = "0.11" prost = "0.11"
prost-types = "0.11" prost-types = "0.11"
tokio = { version = "1.18", features = ["sync"] } tokio = { workspace = true, features = ["sync"] }
tokio-stream = "0.1.8" tokio-stream = "0.1.8"
# tonic v0.8.1 depends on axum-core v0.2.2, which has security vulnerability: # tonic v0.8.1 depends on axum-core v0.2.2, which has security vulnerability:
@ -33,7 +33,7 @@ axum-core = ">=0.2.8"
[dev-dependencies] [dev-dependencies]
log = "0.4" log = "0.4"
async-stream = "0.3.2" async-stream = "0.3.2"
futures = "0.3.17" futures.workspace = true
simple_logger = { version = "4.0", default-features = false } simple_logger = { version = "4.0", default-features = false }
[build-dependencies] [build-dependencies]