diff --git a/Cargo.toml b/Cargo.toml index 0cc37470a..78892c6ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,7 @@ serde = "1.0.151" serde_html_form = "0.2.0" serde_json = "1.0.91" thiserror = "1.0.38" +tokio = { version = "1.24", default-features = false, features = ["sync"] } tracing = { version = "0.1.36", default-features = false, features = ["std"] } uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "58758341b72e9e8ff51ecd57a3eb22d6cc41a4b4" } uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs", rev = "58758341b72e9e8ff51ecd57a3eb22d6cc41a4b4" } diff --git a/crates/matrix-sdk-appservice/Cargo.toml b/crates/matrix-sdk-appservice/Cargo.toml index 42538b351..63b7ef24d 100644 --- a/crates/matrix-sdk-appservice/Cargo.toml +++ b/crates/matrix-sdk-appservice/Cargo.toml @@ -42,7 +42,7 @@ serde = { workspace = true } serde_html_form = { workspace = true } serde_json = { workspace = true } serde_yaml = "0.9.4" -tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread"] } +tokio = { workspace = true, features = ["rt-multi-thread"] } thiserror = { workspace = true } tower = { version = "0.4.13", default-features = false } tracing = { workspace = true } @@ -50,6 +50,6 @@ url = "2.2.2" [dev-dependencies] matrix-sdk-test = { version = "0.6.0", path = "../../testing/matrix-sdk-test", features = ["appservice"] } -tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing-subscriber = "0.3.11" wiremock = "0.5.13" diff --git a/crates/matrix-sdk-base/Cargo.toml b/crates/matrix-sdk-base/Cargo.toml index 2e24fe0f1..e73f53c9c 100644 --- a/crates/matrix-sdk-base/Cargo.toml +++ b/crates/matrix-sdk-base/Cargo.toml @@ -43,7 +43,7 @@ once_cell = { workspace = true } ruma = { workspace = true, features = ["canonical-json"] } serde = { workspace = true, features = ["rc"] } serde_json = { workspace = true } -tokio = { version = "1.24", default-features = false, features = ["sync"] } +tokio = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } zeroize = { workspace = true, features = ["zeroize_derive"] } @@ -58,7 +58,7 @@ matrix-sdk-test = { version = "0.6.0", path = "../../testing/matrix-sdk-test" } tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] wasm-bindgen-test = "0.3.33" diff --git a/crates/matrix-sdk-common/Cargo.toml b/crates/matrix-sdk-common/Cargo.toml index ccb4161c6..d038d84d6 100644 --- a/crates/matrix-sdk-common/Cargo.toml +++ b/crates/matrix-sdk-common/Cargo.toml @@ -31,7 +31,7 @@ wasm-bindgen-futures = { version = "0.4.33", optional = true } gloo-timers = { version = "0.2.6", features = ["futures"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { version = "1.24.2", default-features = false, features = ["rt", "sync", "time"] } +tokio = { workspace = true, features = ["rt", "time"] } [dev-dependencies] matrix-sdk-test = { path = "../../testing/matrix-sdk-test/", version= "0.6.0"} diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml index f39982698..5bcf6b6aa 100644 --- a/crates/matrix-sdk-crypto/Cargo.toml +++ b/crates/matrix-sdk-crypto/Cargo.toml @@ -59,10 +59,10 @@ zeroize = { workspace = true, features = ["zeroize_derive"] } cfg-if = "1.0" [target.'cfg(target_arch = "wasm32")'.dependencies] -tokio = { version = "1.24", default-features = false, features = ["sync"] } +tokio = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { version = "1.24", default-features = false, features = ["time"] } +tokio = { workspace = true, features = ["time"] } [dev-dependencies] anyhow = { workspace = true } @@ -74,5 +74,5 @@ indoc = "1.0.4" matrix-sdk-test = { version = "0.6.0", path = "../../testing/matrix-sdk-test" } proptest = { version = "1.0.0", default-features = false, features = ["std"] } # required for async_test macro -tokio = { version = "1.24.2", default-features = false, features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml index c009a1f19..796780c7d 100644 --- a/crates/matrix-sdk-indexeddb/Cargo.toml +++ b/crates/matrix-sdk-indexeddb/Cargo.toml @@ -32,7 +32,7 @@ ruma = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } thiserror = { workspace = true } -tokio = { version = "1.24", default-features = false, features = ["sync"] } +tokio = { workspace = true } tracing = { workspace = true } wasm-bindgen = "0.2.83" web-sys = { version = "0.3.57", features = ["IdbKeyRange"] } diff --git a/crates/matrix-sdk-sled/Cargo.toml b/crates/matrix-sdk-sled/Cargo.toml index 67f0d2b40..3d3ba6e53 100644 --- a/crates/matrix-sdk-sled/Cargo.toml +++ b/crates/matrix-sdk-sled/Cargo.toml @@ -39,7 +39,7 @@ serde = { workspace = true } serde_json = { workspace = true } sled = "0.34.7" thiserror = { workspace = true } -tokio = { version = "1.24.2", default-features = false, features = ["sync", "fs"] } +tokio = { workspace = true, features = ["fs"] } tracing = { workspace = true } [dev-dependencies] @@ -49,4 +49,4 @@ matrix-sdk-crypto = { path = "../matrix-sdk-crypto", features = ["testing"] } matrix-sdk-test = { path = "../../testing/matrix-sdk-test" } once_cell = { workspace = true } tempfile = "3.3.0" -tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } diff --git a/crates/matrix-sdk-sqlite/Cargo.toml b/crates/matrix-sdk-sqlite/Cargo.toml index 576f5a9e3..1f77625b6 100644 --- a/crates/matrix-sdk-sqlite/Cargo.toml +++ b/crates/matrix-sdk-sqlite/Cargo.toml @@ -33,7 +33,7 @@ ruma = { workspace = true } rusqlite = { version = "0.28.0", features = ["bundled"] } serde = { workspace = true } thiserror = { workspace = true } -tokio = { version = "1.24.2", default-features = false, features = ["sync", "fs"] } +tokio = { workspace = true, features = ["fs"] } tracing = { workspace = true } vodozemac = { workspace = true } @@ -45,5 +45,5 @@ matrix-sdk-crypto = { path = "../matrix-sdk-crypto", features = ["testing"] } matrix-sdk-test = { path = "../../testing/matrix-sdk-test" } once_cell = { workspace = true } tempfile = "3.3.0" -tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml index a8976b2e1..8bd9f4b31 100644 --- a/crates/matrix-sdk/Cargo.toml +++ b/crates/matrix-sdk/Cargo.toml @@ -125,11 +125,11 @@ optional = true [target.'cfg(target_arch = "wasm32")'.dependencies] gloo-timers = { version = "0.2.6", features = ["futures"] } -tokio = { version = "1.24.2", default-features = false, features = ["sync"] } +tokio = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] backoff = { version = "0.4.0", features = ["tokio"] } -tokio = { version = "1.24.2", default-features = false, features = ["fs", "rt"] } +tokio = { workspace = true, features = ["fs", "rt"] } [dev-dependencies] anyhow = { workspace = true } @@ -146,5 +146,5 @@ wasm-bindgen-test = "0.3.33" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] ctor = { workspace = true } -tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } wiremock = "0.5.13" diff --git a/labs/jack-in/Cargo.toml b/labs/jack-in/Cargo.toml index bae5ddd48..096eed58e 100644 --- a/labs/jack-in/Cargo.toml +++ b/labs/jack-in/Cargo.toml @@ -22,7 +22,7 @@ matrix-sdk-common = { path = "../../crates/matrix-sdk-common", version = "0.6.0" matrix-sdk-sled = { path = "../../crates/matrix-sdk-sled", features = ["state-store", "crypto-store"], version = "0.2.0" } sanitize-filename-reader-friendly = "2.2.1" serde_json = { workspace = true } -tokio = { version = "1", features = ["rt-multi-thread", "sync", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing-flame = "0.2" tracing-subscriber = "0.3.15" tui-logger = "0.8.1" diff --git a/testing/matrix-sdk-integration-testing/Cargo.toml b/testing/matrix-sdk-integration-testing/Cargo.toml index a6814bfb2..568367670 100644 --- a/testing/matrix-sdk-integration-testing/Cargo.toml +++ b/testing/matrix-sdk-integration-testing/Cargo.toml @@ -16,6 +16,6 @@ ctor = { workspace = true } matrix-sdk = { path = "../../crates/matrix-sdk" } once_cell = { workspace = true } tempfile = "3.3.0" -tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] } tracing = { workspace = true } tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } diff --git a/testing/matrix-sdk-test/Cargo.toml b/testing/matrix-sdk-test/Cargo.toml index 6e4208c3b..f85704684 100644 --- a/testing/matrix-sdk-test/Cargo.toml +++ b/testing/matrix-sdk-test/Cargo.toml @@ -27,7 +27,7 @@ serde = { workspace = true } serde_json = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { version = "1.24.2", default-features = false, features = ["rt", "macros"] } +tokio = { workspace = true, features = ["rt", "macros"] } [target.'cfg(target_arch = "wasm32")'.dependencies] wasm-bindgen-test = "0.3.33" diff --git a/testing/sliding-sync-integration-test/Cargo.toml b/testing/sliding-sync-integration-test/Cargo.toml index cecf2993d..a02c949eb 100644 --- a/testing/sliding-sync-integration-test/Cargo.toml +++ b/testing/sliding-sync-integration-test/Cargo.toml @@ -12,5 +12,5 @@ eyeball-im = { workspace = true } futures = { version = "0.3.25" } matrix-sdk-integration-testing = { path = "../matrix-sdk-integration-testing", features = ["helpers"] } matrix-sdk = { path = "../../crates/matrix-sdk", features = ["experimental-sliding-sync", "testing"] } -tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] } uuid = { version = "1.2.2" }