refactor: Use workspace dependencies for vodozemac

aringenbach · Oct 18, 2022 · e6891ad · e6891ad
1 parent f57b778
commit e6891ad
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,6 +21,7 @@ uniffi = "0.21.0"
 uniffi_macros = "0.21.0"
 uniffi_bindgen = "0.21.0"
 uniffi_build = { version = "0.21.0", features = ["builtin-bindgen"] }
+vodozemac = "0.3.0"
 
 [profile.release]
 lto = true

diff --git a/bindings/matrix-sdk-crypto-ffi/Cargo.toml b/bindings/matrix-sdk-crypto-ffi/Cargo.toml
@@ -29,6 +29,7 @@ tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
 # keep in sync with uniffi dependency in matrix-sdk-ffi, and uniffi_bindgen in ffi CI job
 uniffi = { workspace = true }
 uniffi_macros = { workspace = true }
+vodozemac = { workspace = true }
 zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
 
 [dependencies.js_int]
@@ -55,9 +56,6 @@ version = "1.17.0"
 default_features = false
 features = ["rt-multi-thread"]
 
-[dependencies.vodozemac]
-version = "0.3.0"
-
 [build-dependencies]
 uniffi_build = { workspace = true, features = ["builtin-bindgen"] }
 

diff --git a/bindings/matrix-sdk-crypto-js/Cargo.toml b/bindings/matrix-sdk-crypto-js/Cargo.toml
@@ -32,7 +32,7 @@ matrix-sdk-crypto = { version = "0.6.0", path = "../../crates/matrix-sdk-crypto"
 matrix-sdk-indexeddb = { version = "0.2.0", path = "../../crates/matrix-sdk-indexeddb", features = ["experimental-nodejs"] }
 matrix-sdk-qrcode = { version = "0.4.0", path = "../../crates/matrix-sdk-qrcode", optional = true }
 ruma = { workspace = true, features = ["js", "rand", "unstable-msc2676", "unstable-msc2677"] }
-vodozemac = { version = "0.3.0", features = ["js"] }
+vodozemac = { workspace = true, features = ["js"] }
 wasm-bindgen = "0.2.80"
 wasm-bindgen-futures = "0.4.30"
 js-sys = "0.3.49"

diff --git a/bindings/matrix-sdk-crypto-nodejs/Cargo.toml b/bindings/matrix-sdk-crypto-nodejs/Cargo.toml
@@ -31,12 +31,9 @@ napi = { version = "2.9.1", default-features = false, features = ["napi6", "toki
 napi-derive = "2.9.1"
 serde_json = "1.0.79"
 http = "0.2.6"
-zeroize = "1.3.0"
 tracing-subscriber = { version = "0.3", default-features = false, features = ["tracing-log", "time", "smallvec", "fmt", "env-filter"], optional = true }
-
-[dependencies.vodozemac]
-version = "0.3.0"
-features = ["js"]
+vodozemac = { workspace = true, features = ["js"]}
+zeroize = "1.3.0"
 
 [build-dependencies]
 napi-build = "2.0.0"
diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml
@@ -48,7 +48,7 @@ serde_json = "1.0.79"
 sha2 = "0.10.2"
 thiserror = "1.0.30"
 tracing = "0.1.34"
-vodozemac = "0.3.0"
+vodozemac = { workspace = true }
 zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

diff --git a/crates/matrix-sdk-qrcode/Cargo.toml b/crates/matrix-sdk-qrcode/Cargo.toml
@@ -21,9 +21,7 @@ byteorder = "1.4.3"
 qrcode = { version = "0.12.0", default-features = false }
 ruma-common = "0.10.0"
 thiserror = "1.0.30"
-
-[dependencies.vodozemac]
-version = "0.3.0"
+vodozemac = { workspace = true }
 
 [dev-dependencies]
 image = "0.23.0"