Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 89 additions & 90 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions crates/agent-tunnel-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ bytes = "1.10"
ipnetwork = "0.20"
serde = { version = "1", features = ["derive"], optional = true }
thiserror = "2.0"
tokio = { version = "1.45", features = ["io-util"] }
tokio = { version = "1.52", features = ["io-util"] }
uuid = { version = "1.17", features = ["v4"] }

[dev-dependencies]
proptest = "1.7"
tokio = { version = "1.45", features = ["rt", "macros"] }
tokio = { version = "1.52", features = ["rt", "macros"] }
4 changes: 2 additions & 2 deletions crates/agent-tunnel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ devolutions-gateway-task = { path = "../devolutions-gateway-task" }

# Async / runtime
async-trait = "0.1"
tokio = { version = "1.45", features = ["sync", "io-util", "macros", "rt", "time"] }
tokio = { version = "1.52", features = ["sync", "io-util", "macros", "rt", "time"] }
parking_lot = "0.12"

# Errors / tracing
Expand Down Expand Up @@ -43,4 +43,4 @@ socket2 = "0.5"

[dev-dependencies]
base64 = "0.22"
tokio = { version = "1.45", features = ["macros"] }
tokio = { version = "1.52", features = ["macros"] }
2 changes: 1 addition & 1 deletion crates/devolutions-gateway-task/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ default = []
named_tasks = ["tokio/tracing"]

[dependencies]
tokio = { version = "1.45", features = ["sync", "rt", "tracing"] }
tokio = { version = "1.52", features = ["sync", "rt", "tracing"] }
async-trait = "0.1"
2 changes: 1 addition & 1 deletion crates/devolutions-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ camino = "1.1"

# Async
async-trait = "0.1"
tokio = { version = "1.45", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }
tokio = { version = "1.52", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }

# Logging
tracing = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/devolutions-pedm-shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ serde = { version = "1.0", features = ["derive"], optional = true }
win-api-wrappers = { path = "../win-api-wrappers", optional = true }
hyper = { version = "~0.14", features = ["client", "http1"], optional = true } # old version required for OpenAPI generator
serde_json = { version = "1.0", optional = true }
tokio = { version = "1.45", features = ["net", "sync"], optional = true }
tokio = { version = "1.52", features = ["net", "sync"], optional = true }
glob = { version = "0.3", optional = true }
regex = { version = "1.11", optional = true }
schemars = { version = "0.8", features = ["uuid1"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/devolutions-pedm-shell-ext/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ publish = false
crate-type = ["cdylib"]

[dependencies]
tokio = { version = "1.45", features = ["sync"] }
tokio = { version = "1.52", features = ["sync"] }
windows-core = "0.61" # necessary because of macro resolving `windows::core`. Must match `win-api-wrappers` version.
devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["pedm_client", "desktop"] }
win-api-wrappers = { path = "../win-api-wrappers" }
Expand Down
2 changes: 1 addition & 1 deletion crates/devolutions-pedm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ serde = "1.0"
serde_json = "1.0"
sha1 = "0.10"
sha2 = "0.10"
tokio = { version = "1.45", features = ["net", "rt-multi-thread"] }
tokio = { version = "1.52", features = ["net", "rt-multi-thread"] }
tower-service = "0.3"
win-api-wrappers = { path = "../win-api-wrappers" }
devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["policy"]}
Expand Down
4 changes: 2 additions & 2 deletions crates/jmux-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workspace = true
jmux-proto = { path = "../jmux-proto" }

# async
tokio = { version = "1.45", features = ["net", "rt", "io-util", "macros", "time"] }
tokio = { version = "1.52", features = ["net", "rt", "io-util", "macros", "time"] }
tokio-util = { version = "0.7", features = ["codec"] }
futures-util = { version = "0.3", features = ["sink"] }

Expand All @@ -33,4 +33,4 @@ bitvec = "1.0"
# Test infrastructure for socket manipulation.
socket2 = "0.5"
# Enable extra tokio features.
tokio = { version = "1.45", features = ["rt-multi-thread"] }
tokio = { version = "1.52", features = ["rt-multi-thread"] }
4 changes: 2 additions & 2 deletions crates/mock-net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = ["Devolutions Inc. <infos@devolutions.net>"]
publish = false

[dependencies]
tokio = { version = "1.45", features = ["io-util", "sync"] }
tokio = { version = "1.52", features = ["io-util", "sync"] }
loom = { version = "0.7", features = ["futures", "checkpoint"] }

[dev-dependencies]
tokio = { version = "1.45", features = ["rt"] }
tokio = { version = "1.52", features = ["rt"] }
2 changes: 1 addition & 1 deletion crates/network-monitor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ network-scanner = { path = "../network-scanner" }
thiserror = "2"
time = { version = "0.3", features = ["serde"] }
tokio-util = { version = "0.7" }
tokio = { version = "1.45", features = ["macros", "sync"] }
tokio = { version = "1.52", features = ["macros", "sync"] }
tracing = "0.1"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/network-scanner-net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tracing = "0.1"
[dev-dependencies]
tracing-cov-mark = { path = "../tracing-cov-mark" }
tracing-subscriber = "0.3"
tokio = { version = "1.45", features = [
tokio = { version = "1.52", features = [
"rt",
"sync",
"macros",
Expand Down
4 changes: 2 additions & 2 deletions crates/network-scanner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ network-scanner-proto = { path = "../network-scanner-proto" }
parking_lot = "0.12"
socket2 = "0.5"
thiserror = "2"
tokio = { version = "1.45", features = ["rt", "sync", "time", "fs"] }
tokio = { version = "1.52", features = ["rt", "sync", "time", "fs"] }
tracing = "0.1"
typed-builder = "0.21"

Expand All @@ -32,5 +32,5 @@ netlink-packet-route = "0.26"
rtnetlink = "0.19"

[dev-dependencies]
tokio = { version = "1.45", features = ["rt", "macros", "rt-multi-thread", "tracing", "signal"] }
tokio = { version = "1.52", features = ["rt", "macros", "rt-multi-thread", "tracing", "signal"] }
tracing-subscriber = "0.3"
2 changes: 1 addition & 1 deletion crates/proxy-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workspace = true

[dependencies]
proxy-types = { path = "../proxy-types" }
tokio = { version = "1.45", features = ["io-util"] }
tokio = { version = "1.52", features = ["io-util"] }
pin-project-lite = "0.2"
bytes = "1.10"

Expand Down
2 changes: 1 addition & 1 deletion crates/proxy-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ workspace = true
proxy-socks = { path = "../proxy-socks" }
proxy-http = { path = "../proxy-http" }
proxy-types = { path = "../proxy-types" }
tokio = { version = "1.45", features = ["rt", "net", "rt-multi-thread", "macros"] }
tokio = { version = "1.52", features = ["rt", "net", "rt-multi-thread", "macros"] }
4 changes: 2 additions & 2 deletions crates/proxy-socks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ workspace = true

[dependencies]
proxy-types = { path = "../proxy-types" }
tokio = { version = "1.45", features = ["io-util"] }
tokio = { version = "1.52", features = ["io-util"] }

[dev-dependencies]
tokio = { version = "1.45", features = ["rt", "macros"] }
tokio = { version = "1.52", features = ["rt", "macros"] }
tokio-test = "0.4"
proptest = "1.7"
proxy-generators = { path = "../proxy-generators" }
2 changes: 1 addition & 1 deletion crates/proxy-tester/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition = "2024"
publish = false

[dependencies]
tokio = { version = "1.45", features = ["rt", "net"] }
tokio = { version = "1.52", features = ["rt", "net"] }
proxy-http = { path = "../proxy-http" }
proxy-socks = { path = "../proxy-socks" }
4 changes: 2 additions & 2 deletions crates/terminal-streamer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ edition = "2024"

[dependencies]
anyhow = "1.0"
tokio = { version = "1.45", features = ["io-util", "sync", "macros", "rt-multi-thread", "time"] }
tokio = { version = "1.52", features = ["io-util", "sync", "macros", "rt-multi-thread", "time"] }
tracing = "0.1"

[lints]
workspace = true

[dev-dependencies]
tokio = { version = "1.45", features = ["fs"] }
tokio = { version = "1.52", features = ["fs"] }
2 changes: 1 addition & 1 deletion crates/test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ workspace = true

[dependencies]
transport = { path = "../transport" }
tokio = { version = "1.45", features = ["io-util"] }
tokio = { version = "1.52", features = ["io-util"] }
tokio-tungstenite = "0.26"
futures-util = "0.3"
proptest = "1.7"
Expand Down
2 changes: 1 addition & 1 deletion crates/transport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false
workspace = true

[dependencies]
tokio = { version = "1.45", features = ["io-util", "sync", "rt", "macros", "time"] }
tokio = { version = "1.52", features = ["io-util", "sync", "rt", "macros", "time"] }
futures-core = "0.3"
futures-sink = "0.3"
futures-util = { version = "0.3", features = ["sink"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/video-streamer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bench = ["perf-diagnostics"]
[dependencies]
anyhow = "1.0"
futures-util = { version = "0.3", features = ["sink"] }
tokio = { version = "1.45", features = [
tokio = { version = "1.52", features = [
"io-util",
"rt",
"rt-multi-thread",
Expand All @@ -33,7 +33,7 @@ webm-iterable = "0.6"
[dev-dependencies]
criterion = "0.5"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tokio = { version = "1.45", features = [
tokio = { version = "1.52", features = [
"io-util",
"rt",
"rt-multi-thread",
Expand Down
2 changes: 1 addition & 1 deletion devolutions-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ features = [
]

[dependencies.tokio]
version = "1.45"
version = "1.52"
features = [
"signal",
"net",
Expand Down
2 changes: 1 addition & 1 deletion devolutions-gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ rustls-native-certs = "0.8"
tracing = "0.1"

# Async, futures…
tokio = { version = "1.45", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }
tokio = { version = "1.52", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12", "ring"] }
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-native-roots", "json", "stream", "http2", "socks"] }
http-client-proxy = { path = "../crates/http-client-proxy" }
Expand Down
2 changes: 1 addition & 1 deletion jetsocat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ seahorse = "2.2"
humantime = "2.2"

# async
tokio = { version = "1.45", features = ["io-std", "io-util", "net", "fs", "signal", "time", "rt", "sync", "process", "rt-multi-thread", "macros"] }
tokio = { version = "1.52", features = ["io-std", "io-util", "net", "fs", "signal", "time", "rt", "sync", "process", "rt-multi-thread", "macros"] }
tokio-tungstenite = "0.26"
futures-util = "0.3"
transport = { path = "../crates/transport" }
Expand Down
Loading