Add futures-util as a workspace dependency

… and always activate its `alloc` feature. Fixes building matrix-sdk without the e2e-encryption feature.
aringenbach · Mar 8, 2023 · 68f8ed5 · 68f8ed5
1 parent be6c7c8
commit 68f8ed5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,6 +29,7 @@ ctor = "0.1.26"
 dashmap = "5.2.0"
 eyeball = "0.1.4"
 eyeball-im = "0.1.0"
+futures-util = { version = "0.3.26", default-features = false, features = ["alloc"] }
 http = "0.2.6"
 ruma = { git = "https://github.com/ruma/ruma", rev = "2edfe5bc5f3ee88014e57230c50a5e005119344a", features = ["client-api-c"] }
 ruma-common = { git = "https://github.com/ruma/ruma", rev = "2edfe5bc5f3ee88014e57230c50a5e005119344a" }

diff --git a/crates/matrix-sdk-base/Cargo.toml b/crates/matrix-sdk-base/Cargo.toml
@@ -32,7 +32,7 @@ async-trait = { workspace = true }
 dashmap = { workspace = true }
 eyeball = { workspace = true }
 futures-core = "0.3.21"
-futures-util = { version = "0.3.21", default-features = false }
+futures-util = { workspace = true }
 http = { workspace = true, optional = true }
 matrix-sdk-common = { version = "0.6.0", path = "../matrix-sdk-common" }
 matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", optional = true }

diff --git a/crates/matrix-sdk-common/Cargo.toml b/crates/matrix-sdk-common/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 async-lock = "2.5.0"
-futures-util = { version = "0.3.21", default-features = false, features = ["channel"] }
+futures-util = { workspace = true, features = ["channel"] }
 wasm-bindgen-futures = { version = "0.4.33", optional = true }
 gloo-timers = { version = "0.2.6", features = ["futures"] }
 

diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml
@@ -36,7 +36,7 @@ dashmap = { workspace = true }
 event-listener = "2.5.2"
 eyeball = { workspace = true }
 futures-core = "0.3.24"
-futures-util = { version = "0.3.21", default-features = false, features = ["alloc"] }
+futures-util = { workspace = true }
 hmac = "0.12.1"
 http = { workspace = true, optional = true } # feature = testing only
 matrix-sdk-qrcode = { version = "0.4.0", path = "../matrix-sdk-qrcode", optional = true }

diff --git a/crates/matrix-sdk-sled/Cargo.toml b/crates/matrix-sdk-sled/Cargo.toml
@@ -29,7 +29,7 @@ async-trait = { workspace = true }
 dashmap = { workspace = true }
 fs_extra = "1.2.0"
 futures-core = "0.3.21"
-futures-util = { version = "0.3.21", default-features = false }
+futures-util = { workspace = true }
 matrix-sdk-base = { version = "0.6.0", path = "../matrix-sdk-base", optional = true }
 matrix-sdk-common = { version = "0.6.0", path = "../matrix-sdk-common" }
 matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", optional = true }

diff --git a/crates/matrix-sdk-sqlite/Cargo.toml b/crates/matrix-sdk-sqlite/Cargo.toml
@@ -23,7 +23,7 @@ dashmap = { workspace = true }
 deadpool-sqlite = "0.5.0"
 fs_extra = "1.2.0"
 futures-core = "0.3.21"
-futures-util = { version = "0.3.21", default-features = false }
+futures-util = { workspace = true }
 matrix-sdk-base = { version = "0.6.0", path = "../matrix-sdk-base", optional = true }
 matrix-sdk-common = { version = "0.6.0", path = "../matrix-sdk-common" }
 matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", optional = true }

diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml
@@ -74,7 +74,7 @@ eyeball = { workspace = true }
 eyeball-im = { workspace = true }
 eyre = { version = "0.6.8", optional = true }
 futures-core = "0.3.21"
-futures-util = { version = "0.3.21", default-features = false }
+futures-util = { workspace = true }
 http = { workspace = true }
 im = { version = "15.1.0", features = ["serde"] }
 indexmap = "1.9.1"