Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Hoist shared dependencies to the workspace

Manav Rathi5d4cd3578995
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 222d71b6b0..766404dbdc 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -32,16 +32,21 @@ ente-ensu = { path = "crates/ensu" }
ente-image = { path = "crates/image" }
ente-paste = { path = "crates/paste" }
ente-photos = { path = "crates/photos" }
-ente-rs = { path = "apps/cli" }
ente-space = { path = "space" }
ente-test-support = { path = "crates/test-support" }
+md-5 = "0.11.0"
+mockito = "1.7.2"
ort = { git = "https://github.com/pykeio/ort.git", rev = "31c8f1443bb579bfddb82705288347697e468fb3", default-features = false }
ort-sys = { git = "https://github.com/pykeio/ort.git", rev = "31c8f1443bb579bfddb82705288347697e468fb3", default-features = false }
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
+sha2 = "0.11.0"
thiserror = "2.0.18"
uniffi = { version = "0.31.0" }
+url = "2.5.8"
+urlencoding = "2.1.3"
wasm-bindgen = "0.2.125"
+zeroize = { version = "1.8.2", features = ["derive"] }
# Unoptimized Argon2 makes production-strength derivations dominate test runtime.
[profile.dev.package.argon2]
diff --git a/rust/apps/cli/Cargo.toml b/rust/apps/cli/Cargo.toml
index af4a07458b..0dc42043f0 100644
--- a/rust/apps/cli/Cargo.toml
+++ b/rust/apps/cli/Cargo.toml
@@ -24,7 +24,7 @@ tokio = { version = "1.41", features = ["full"] }
futures = "0.3"
# Cryptography - using ente-core pure Rust implementation
-zeroize = { version = "1.8", features = ["derive"] }
+zeroize.workspace = true
# Storage
rusqlite = { version = "0.38", features = ["bundled", "serde_json"] }
@@ -36,7 +36,7 @@ env_logger = "0.11"
dirs = "5.0"
chrono = "0.4"
uuid = { version = "1.11", features = ["serde", "v4"] }
-urlencoding = "2.1"
+urlencoding.workspace = true
indicatif = "0.18"
dialoguer = "0.11"
open = "5.0"
@@ -46,7 +46,7 @@ zip = "2.2"
[dev-dependencies]
ente-test-support.workspace = true
-mockito = "1.6"
-url = "2.5.8"
-sha2 = "0.11"
+mockito.workspace = true
+url.workspace = true
+sha2.workspace = true
srp = { version = "0.7.0-rc.3", default-features = false }
diff --git a/rust/bindings/wasm/ente-wasm/Cargo.toml b/rust/bindings/wasm/ente-wasm/Cargo.toml
index 188faa9c6c..2eed3981cb 100644
--- a/rust/bindings/wasm/ente-wasm/Cargo.toml
+++ b/rust/bindings/wasm/ente-wasm/Cargo.toml
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
ente-accounts.workspace = true
ente-contacts.workspace = true
ente-core.workspace = true
-md-5 = "0.11"
+md-5.workspace = true
js-sys = "0.3"
serde.workspace = true
serde-wasm-bindgen = "0.6"
diff --git a/rust/crates/accounts/Cargo.toml b/rust/crates/accounts/Cargo.toml
index f5ba017b2e..167a1f7d91 100644
--- a/rust/crates/accounts/Cargo.toml
+++ b/rust/crates/accounts/Cargo.toml
@@ -13,17 +13,17 @@ thiserror.workspace = true
bip39 = { version = "2", default-features = false, features = ["std"] }
getrandom = { version = "0.2", features = ["js"] }
hex = "0.4"
-sha2 = "0.11"
+sha2.workspace = true
srp = { version = "0.7.0-rc.3", default-features = false }
subtle = "2"
uuid = { version = "1.11", features = ["js", "serde", "v4"] }
-zeroize = { version = "1.8", features = ["derive"] }
-urlencoding = "2.1"
+zeroize.workspace = true
+urlencoding.workspace = true
[dev-dependencies]
ente-test-support.workspace = true
hmac = "0.13"
-mockito = "1.6"
+mockito.workspace = true
rand_core = { version = "0.6", features = ["getrandom"] }
sha1 = "0.11"
tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
diff --git a/rust/crates/assets/Cargo.toml b/rust/crates/assets/Cargo.toml
index fe6ffa7711..dcd955c4df 100644
--- a/rust/crates/assets/Cargo.toml
+++ b/rust/crates/assets/Cargo.toml
@@ -8,7 +8,7 @@ futures-util = "0.3.32"
reqwest = { version = "0.12", default-features = false, features = ["http2", "charset", "system-proxy", "rustls-tls-webpki-roots"] }
serde.workspace = true
serde_json.workspace = true
-sha2 = "0.11.0"
+sha2.workspace = true
tar = "0.4.46"
thiserror.workspace = true
tokio = { version = "1", features = ["macros", "rt", "sync"] }
diff --git a/rust/crates/contacts/Cargo.toml b/rust/crates/contacts/Cargo.toml
index c6c020baee..4277580f3b 100644
--- a/rust/crates/contacts/Cargo.toml
+++ b/rust/crates/contacts/Cargo.toml
@@ -11,15 +11,15 @@ ente-core.workspace = true
serde.workspace = true
serde_json.workspace = true
thiserror.workspace = true
-md-5 = "0.11"
-sha2 = "0.11"
+md-5.workspace = true
+sha2.workspace = true
uuid = { version = "1", features = ["v4", "js"] }
[dev-dependencies]
ente-test-support.workspace = true
hmac = "0.13"
-mockito = "1.6"
+mockito.workspace = true
reqwest = { version = "0.12", features = ["json", "rustls-tls-native-roots"] }
sha1 = "0.11"
tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
-zeroize = { version = "1.8", features = ["derive"] }
+zeroize.workspace = true
diff --git a/rust/crates/core/Cargo.toml b/rust/crates/core/Cargo.toml
index c63412728e..b593b7d63a 100644
--- a/rust/crates/core/Cargo.toml
+++ b/rust/crates/core/Cargo.toml
@@ -19,7 +19,7 @@ argon2 = "0.5"
blake2b_simd = "1.0"
rand_core = { version = "0.6", features = ["getrandom"] }
subtle = "2"
-md-5 = "0.11"
+md-5.workspace = true
# Randomness
#
@@ -31,7 +31,7 @@ getrandom = { version = "0.2", features = ["js"] }
# Common dependencies
base64 = "0.22"
log = "0.4"
-zeroize = { version = "1.8.2", features = ["derive"] }
+zeroize.workspace = true
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
reqwest = { version = "0.12", default-features = false, features = ["stream"] }
@@ -44,7 +44,7 @@ gloo-timers = { version = "0.3.0", features = ["futures"] }
[dev-dependencies]
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
-mockito = "1.6"
+mockito.workspace = true
[lints.rust]
missing_docs = "warn"
diff --git a/rust/crates/ensu/Cargo.toml b/rust/crates/ensu/Cargo.toml
index 01dd009119..7636641c54 100644
--- a/rust/crates/ensu/Cargo.toml
+++ b/rust/crates/ensu/Cargo.toml
@@ -16,9 +16,9 @@ serde_json.workspace = true
thiserror.workspace = true
tokio = { version = "1", features = ["rt", "time"] }
transcribe-rs = { version = "0.3.11", default-features = false, features = ["onnx", "vad-silero"], optional = true }
-url = "2.5.8"
+url.workspace = true
uuid = { version = "1", features = ["v4", "rng-getrandom"] }
-zeroize = { version = "1.8", features = ["derive"] }
+zeroize.workspace = true
zstd = "0.13.3"
[dev-dependencies]
diff --git a/rust/crates/paste/Cargo.toml b/rust/crates/paste/Cargo.toml
index 31597a47b2..0dfdf8dd7d 100644
--- a/rust/crates/paste/Cargo.toml
+++ b/rust/crates/paste/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2024"
ente-core.workspace = true
serde.workspace = true
thiserror.workspace = true
-url = "2.5.8"
+url.workspace = true
[dev-dependencies]
-mockito = "1.6"
+mockito.workspace = true
serde_json.workspace = true
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
diff --git a/rust/crates/photos/Cargo.toml b/rust/crates/photos/Cargo.toml
index 980da9e89d..f117885330 100644
--- a/rust/crates/photos/Cargo.toml
+++ b/rust/crates/photos/Cargo.toml
@@ -68,4 +68,4 @@ serde_json.workspace = true
tar = "0.4"
tempfile = "3.12"
tokio = { version = "1", features = ["macros", "rt"] }
-url = "2.5.8"
+url.workspace = true
diff --git a/rust/space/Cargo.toml b/rust/space/Cargo.toml
index 58fd2b32a3..95c19fe569 100644
--- a/rust/space/Cargo.toml
+++ b/rust/space/Cargo.toml
@@ -8,17 +8,17 @@ museum = []
[dependencies]
ente-core.workspace = true
-md-5 = "0.11"
+md-5.workspace = true
serde.workspace = true
serde_json.workspace = true
thiserror.workspace = true
-urlencoding = "2"
-zeroize = { version = "1.8", features = ["derive"] }
+urlencoding.workspace = true
+zeroize.workspace = true
[dev-dependencies]
ente-accounts.workspace = true
ente-test-support.workspace = true
-mockito = "1.6"
+mockito.workspace = true
reqwest = { version = "0.12", features = ["json", "rustls-tls-native-roots"] }
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
uuid = { version = "1.11", features = ["v4"] }