Skip to content

Commit

Permalink
build(deps): bump the tokio group with 3 updates
Browse files Browse the repository at this point in the history
Bumps the tokio group with 3 updates: [tokio](https://github.com/tokio-rs/tokio), [tokio-util](https://github.com/tokio-rs/tokio) and [tokio-tungstenite](https://github.com/snapview/tokio-tungstenite).


Updates `tokio` from 1.38.1 to 1.40.0
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.38.1...tokio-1.40.0)

Updates `tokio-util` from 0.7.11 to 0.7.12
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-util-0.7.11...tokio-util-0.7.12)

Updates `tokio-tungstenite` from 0.21.0 to 0.24.0
- [Changelog](https://github.com/snapview/tokio-tungstenite/blob/master/CHANGELOG.md)
- [Commits](snapview/tokio-tungstenite@v0.21.0...v0.24.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: tokio
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: tokio
- dependency-name: tokio-tungstenite
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: tokio
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored Sep 23, 2024
1 parent 31831e9 commit 51e1ae1
Show file tree
Hide file tree
Showing 19 changed files with 153 additions and 134 deletions.
237 changes: 128 additions & 109 deletions Cargo.lock

Large diffs are not rendered by default.

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.38", features = ["sync", "rt", "tracing"] }
tokio = { version = "1.40", 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.38", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }
tokio = { version = "1.40", 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.210", 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.128", optional = true }
tokio = { version = "1.38.0", features = ["net", "sync"], optional = true }
tokio = { version = "1.40.0", features = ["net", "sync"], optional = true }
glob = { version = "0.3.1", optional = true }
regex = { version = "1.10.6", optional = true }
schemars = { version = "0.8.21", 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.38.0", features = ["sync"] }
tokio = { version = "1.40.0", features = ["sync"] }
windows-core = "0.58.0" # 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.210"
serde_json = "1.0.128"
sha1 = "0.10.6"
sha2 = "0.10.8"
tokio = { version = "1.38.0", features = ["net", "rt-multi-thread"] }
tokio = { version = "1.40.0", features = ["net", "rt-multi-thread"] }
tower-service = "0.3.2"
win-api-wrappers = { path = "../win-api-wrappers" }
devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["policy"]}
Expand Down
2 changes: 1 addition & 1 deletion 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.38", features = ["net", "rt", "io-util", "macros"] }
tokio = { version = "1.40", features = ["net", "rt", "io-util", "macros"] }
tokio-util = { version = "0.7", features = ["codec"] }
futures-util = { version = "0.3", features = ["sink"] }

Expand Down
4 changes: 2 additions & 2 deletions crates/mock-net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ authors = ["Devolutions Inc. <[email protected]>"]
publish = false

[dependencies]
tokio = { version = "1.38", features = ["io-util", "sync"] }
tokio = { version = "1.40", features = ["io-util", "sync"] }
loom = { version = "0.7", features = ["futures", "checkpoint"] }
lazy_static = "1.5"

[dev-dependencies]
tokio = { version = "1.38", features = ["rt"] }
tokio = { version = "1.40", features = ["rt"] }
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.38", features = [
tokio = { version = "1.40", 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 = "1"
tokio = { version = "1.38", features = ["rt", "sync", "time", "fs"] }
tokio = { version = "1.40", features = ["rt", "sync", "time", "fs"] }
tracing = "0.1"
typed-builder = "0.19"
serde = "1"
Expand All @@ -33,5 +33,5 @@ netlink-packet-route = "0.19"
rtnetlink = "0.14"

[dev-dependencies]
tokio = { version = "1.38", features = ["rt", "macros", "rt-multi-thread", "tracing", "signal"] }
tokio = { version = "1.40", 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.38", features = ["io-util"] }
tokio = { version = "1.40", features = ["io-util"] }
pin-project-lite = "0.2"
bytes = "1.6"

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.38", features = ["rt", "net", "rt-multi-thread", "macros"] }
tokio = { version = "1.40", 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.38", features = ["io-util"] }
tokio = { version = "1.40", features = ["io-util"] }

[dev-dependencies]
tokio = { version = "1.38", features = ["rt", "macros"] }
tokio = { version = "1.40", features = ["rt", "macros"] }
tokio-test = "0.4"
proptest = "1.5"
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 = "2021"
publish = false

[dependencies]
tokio = { version = "1.38", features = ["rt", "net"] }
tokio = { version = "1.40", features = ["rt", "net"] }
proxy-http = { path = "../proxy-http" }
proxy-socks = { path = "../proxy-socks" }
4 changes: 2 additions & 2 deletions crates/test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ workspace = true

[dependencies]
transport = { path = "../transport" }
tokio = { version = "1.38", features = ["io-util"] }
tokio-tungstenite = "0.21"
tokio = { version = "1.40", features = ["io-util"] }
tokio-tungstenite = "0.24"
futures-util = "0.3"
proptest = "1.5"
anyhow = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/transport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ publish = false
workspace = true

[dependencies]
tokio = { version = "1.38", features = ["io-util"] }
tokio = { version = "1.40", features = ["io-util"] }
futures-core = "0.3"
futures-sink = "0.3"
pin-project-lite = "0.2"

[dev-dependencies]
futures-util = "0.3"
test-utils = { path = "../test-utils" }
tokio = { version = "1.38", features = ["rt", "macros"] }
tokio = { version = "1.40", features = ["rt", "macros"] }
proptest = "1.5"
anyhow = "1"
2 changes: 1 addition & 1 deletion devolutions-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ features = [
]

[dependencies.tokio]
version = "1.38"
version = "1.40"
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 @@ -64,7 +64,7 @@ argon2 = { version = "0.5", features = ["std"] }
tracing = "0.1"

# Async, futures…
tokio = { version = "1.38", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot", "fs"] }
tokio = { version = "1.40", 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"] }
futures = "0.3"
Expand Down
6 changes: 3 additions & 3 deletions jetsocat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ seahorse = "2.2"
humantime = "2.1"

# async
tokio = { version = "1.38", features = ["io-std", "io-util", "net", "fs", "time", "rt", "sync", "process", "rt-multi-thread", "macros"] }
tokio-tungstenite = "0.21"
tokio = { version = "1.40", features = ["io-std", "io-util", "net", "fs", "time", "rt", "sync", "process", "rt-multi-thread", "macros"] }
tokio-tungstenite = "0.24"
futures-util = "0.3"
transport = { path = "../crates/transport" }

Expand All @@ -57,5 +57,5 @@ sysinfo = { version = "0.30", default-features = false }

[dev-dependencies]
test-utils = { path = "../crates/test-utils" }
tokio = { version = "1.38", features = ["time"] }
tokio = { version = "1.40", features = ["time"] }
proptest = "1.5"

0 comments on commit 51e1ae1

Please sign in to comment.