diff --git a/Cargo.lock b/Cargo.lock index eda0b2249c..7f00b37917 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -431,7 +431,7 @@ dependencies = [ "sync_wrapper 1.0.0", "tokio", "tokio-tungstenite 0.21.0", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -941,8 +941,8 @@ dependencies = [ "serde_derive", "serde_json", "tokio", - "tokio-tungstenite 0.20.1", - "tower", + "tokio-tungstenite 0.24.0", + "tower 0.5.1", "tower-http", "tracing", "tracing-error", @@ -966,7 +966,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite 0.24.0", "tracing", "tracing-error", "tracing-log", @@ -1479,7 +1479,7 @@ dependencies = [ "pin-project-lite", "socket2 0.5.5", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2900,28 +2900,28 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", - "native-tls", "tokio", - "tokio-native-tls", - "tungstenite 0.20.1", + "tungstenite 0.21.0", ] [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", + "native-tls", "tokio", - "tungstenite 0.21.0", + "tokio-native-tls", + "tungstenite 0.24.0", ] [[package]] @@ -2949,6 +2949,22 @@ dependencies = [ "pin-project", "pin-project-lite", "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", "tokio-util", "tower-layer", "tower-service", @@ -2984,15 +3000,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tower_client" @@ -3006,7 +3022,7 @@ dependencies = [ "hyper-tls", "hyper-util", "tokio", - "tower", + "tower 0.5.1", "tower-http", "tracing", "tracing-subscriber", @@ -3104,17 +3120,16 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes 1.7.1", "data-encoding", - "http 0.2.11", + "http 1.1.0", "httparse", "log", - "native-tls", "rand 0.8.5", "sha1 0.10.6", "thiserror", @@ -3124,9 +3139,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" dependencies = [ "byteorder", "bytes 1.7.1", @@ -3134,10 +3149,10 @@ dependencies = [ "http 1.1.0", "httparse", "log", + "native-tls", "rand 0.8.5", "sha1 0.10.6", "thiserror", - "url", "utf-8", ] @@ -3167,7 +3182,7 @@ dependencies = [ "surf", "thiserror", "tokio", - "tower", + "tower 0.5.1", "tower-service", "tracing", "twitch_oauth2", @@ -3221,18 +3236,18 @@ dependencies = [ [[package]] name = "typed-builder" -version = "0.18.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444d8748011b93cb168770e8092458cb0f8854f931ff82fdf6ddfbd72a9c933e" +checksum = "7e14ed59dc8b7b26cacb2a92bad2e8b1f098806063898ab42a3bd121d7d45e75" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.18.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352" +checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 6a021287f2..1d874154a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ twitch_types = { version = "0.4.5", features = [ thiserror = "1.0.50" displaydoc = "0.2.4" http = "1.1.0" -typed-builder = { version = "0.18.0", optional = true } +typed-builder = { version = "0.20.0", optional = true } url = "2.4.1" once_cell = "1.18.0" twitch_oauth2 = { workspace = true, optional = true } @@ -163,7 +163,7 @@ reqwest = "0.12.2" hyper = "1.2.0" [build-dependencies] -tower = "0.4.13" +tower = "0.5.0" version_check = "0.9.4" [[example]] diff --git a/examples/eventsub/Cargo.toml b/examples/eventsub/Cargo.toml index db535e6a15..b90d6f3007 100644 --- a/examples/eventsub/Cargo.toml +++ b/examples/eventsub/Cargo.toml @@ -22,8 +22,8 @@ serde = "1.0.190" serde_derive = "1.0.190" serde_json = { version = "1" } tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] } -tokio-tungstenite = "0.20.1" -tower = "0.4" +tokio-tungstenite = "0.24.0" +tower = "0.5" tower-http = { version = "0.5.2", features = ["fs", "trace", "catch-panic"] } tracing = "0.1.40" tracing-error = "0.2.0" diff --git a/examples/eventsub_websocket/Cargo.toml b/examples/eventsub_websocket/Cargo.toml index ae493a1a08..0c4b73e221 100644 --- a/examples/eventsub_websocket/Cargo.toml +++ b/examples/eventsub_websocket/Cargo.toml @@ -16,7 +16,7 @@ reqwest = { version = "0.12.2", features = ["json"] } serde = "1" serde_json = { version = "1" } tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] } -tokio-tungstenite = { version = "0.20.1", features = ["native-tls"] } +tokio-tungstenite = { version = "0.24.0", features = ["native-tls"] } tracing = "0.1.40" tracing-error = "0.2.0" tracing-log = "0.2.0" diff --git a/examples/tower_client/Cargo.toml b/examples/tower_client/Cargo.toml index a42c1b756a..8278270090 100644 --- a/examples/tower_client/Cargo.toml +++ b/examples/tower_client/Cargo.toml @@ -14,7 +14,7 @@ hyper = { version = "1.2.0", features = ["http1"] } hyper-tls = "0.6.0" hyper-util = { version = "0.1.3", features = ["client-legacy"] } tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] } -tower = { version = "0.4.13", features = ["retry", "util", "limit", "buffer"] } +tower = { version = "0.5.0", features = ["retry", "util", "limit", "buffer"] } tower-http = { version = "0.5.2", features = ["set-header", "trace", "decompression-gzip"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }