π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Sort dependency lists, hoist frb and uniffi pins
Manav Rathic12ac8d337fd
diff --git a/rust/Cargo.toml b/rust/Cargo.tomlindex 766404dbdc..1f510a6223 100644--- a/rust/Cargo.toml+++ b/rust/Cargo.toml@@ -34,6 +34,8 @@ ente-paste = { path = "crates/paste" }ente-photos = { path = "crates/photos" }ente-space = { path = "space" }ente-test-support = { path = "crates/test-support" }+flutter_rust_bridge = "=2.12.0"+flutter_rust_bridge_codegen = "=2.12.0"md-5 = "0.11.0"mockito = "1.7.2"ort = { git = "https://github.com/pykeio/ort.git", rev = "31c8f1443bb579bfddb82705288347697e468fb3", default-features = false }@@ -43,6 +45,7 @@ serde_json = "1.0.149"sha2 = "0.11.0"thiserror = "2.0.18"uniffi = { version = "0.31.0" }+uniffi_bindgen = { version = "=0.31.0", default-features = false, features = ["cargo-metadata"] }url = "2.5.8"urlencoding = "2.1.3"wasm-bindgen = "0.2.125"diff --git a/rust/apps/cli/Cargo.toml b/rust/apps/cli/Cargo.tomlindex 0dc42043f0..f5a50cc8f1 100644--- a/rust/apps/cli/Cargo.toml+++ b/rust/apps/cli/Cargo.toml@@ -11,42 +11,31 @@ license = "AGPL-3.0-only"museum = [][dependencies]-# CLI+chrono = "0.4"clap = { version = "4.5", features = ["derive", "env"] }+dialoguer = "0.11"+dirs = "5.0"ente-accounts.workspace = trueente-core.workspace = trueente-paste.workspace = true-serde.workspace = true-serde_json.workspace = true--# Async runtime and networking-tokio = { version = "1.41", features = ["full"] }+env_logger = "0.11"futures = "0.3"--# Cryptography - using ente-core pure Rust implementation-zeroize.workspace = true--# Storage+indicatif = "0.18"+log = "0.4"+open = "5.0"rusqlite = { version = "0.38", features = ["bundled", "serde_json"] }--# Utilities+serde.workspace = true+serde_json.workspace = truethiserror.workspace = true-log = "0.4"-env_logger = "0.11"-dirs = "5.0"-chrono = "0.4"-uuid = { version = "1.11", features = ["serde", "v4"] }+tokio = { version = "1.41", features = ["full"] }urlencoding.workspace = true-indicatif = "0.18"-dialoguer = "0.11"-open = "5.0"--# File operations+uuid = { version = "1.11", features = ["serde", "v4"] }+zeroize.workspace = truezip = "2.2"[dev-dependencies]ente-test-support.workspace = truemockito.workspace = true-url.workspace = truesha2.workspace = truesrp = { version = "0.7.0-rc.3", default-features = false }+url.workspace = truediff --git a/rust/apps/codegen/Cargo.toml b/rust/apps/codegen/Cargo.tomlindex 77ced9955b..f310be4fab 100644--- a/rust/apps/codegen/Cargo.toml+++ b/rust/apps/codegen/Cargo.toml@@ -4,5 +4,5 @@ edition = "2024"[dependencies]camino = "=1.2.2"-flutter_rust_bridge_codegen = "=2.12.0"-uniffi_bindgen = { version = "=0.31.0", default-features = false, features = ["cargo-metadata"] }+flutter_rust_bridge_codegen.workspace = true+uniffi_bindgen.workspace = truediff --git a/rust/bindings/frb/ente-rust/Cargo.toml b/rust/bindings/frb/ente-rust/Cargo.tomlindex dfec2e64dd..9d9ae6c663 100644--- a/rust/bindings/frb/ente-rust/Cargo.toml+++ b/rust/bindings/frb/ente-rust/Cargo.toml@@ -6,10 +6,10 @@ edition = "2024"crate-type = ["cdylib", "staticlib"][dependencies]-flutter_rust_bridge = "=2.12.0"ente-accounts.workspace = trueente-contacts.workspace = trueente-core.workspace = true+flutter_rust_bridge.workspace = true[features]default = []diff --git a/rust/bindings/frb/photos/Cargo.toml b/rust/bindings/frb/photos/Cargo.tomlindex e22dc35a1b..0961f7c822 100644--- a/rust/bindings/frb/photos/Cargo.toml+++ b/rust/bindings/frb/photos/Cargo.toml@@ -6,9 +6,9 @@ edition = "2024"crate-type = ["cdylib", "staticlib"][dependencies]-flutter_rust_bridge = "=2.12.0"ente-image.workspace = trueente-photos.workspace = true+flutter_rust_bridge.workspace = true[lints.rust]unexpected_cfgs = { level = "warn", check-cfg = ['cfg(frb_expand)'] }diff --git a/rust/bindings/wasm/ente-wasm/Cargo.toml b/rust/bindings/wasm/ente-wasm/Cargo.tomlindex 2eed3981cb..26ea41e780 100644--- a/rust/bindings/wasm/ente-wasm/Cargo.toml+++ b/rust/bindings/wasm/ente-wasm/Cargo.toml@@ -9,8 +9,8 @@ crate-type = ["cdylib"]ente-accounts.workspace = trueente-contacts.workspace = trueente-core.workspace = true-md-5.workspace = truejs-sys = "0.3"+md-5.workspace = trueserde.workspace = trueserde-wasm-bindgen = "0.6"wasm-bindgen.workspace = truediff --git a/rust/crates/accounts/Cargo.toml b/rust/crates/accounts/Cargo.tomlindex 167a1f7d91..05eb8c8330 100644--- a/rust/crates/accounts/Cargo.toml+++ b/rust/crates/accounts/Cargo.toml@@ -6,19 +6,19 @@ edition = "2024"museum = [][dependencies]-ente-core.workspace = true-serde.workspace = true-serde_json.workspace = true-thiserror.workspace = truebip39 = { version = "2", default-features = false, features = ["std"] }+ente-core.workspace = truegetrandom = { version = "0.2", features = ["js"] }hex = "0.4"+serde.workspace = true+serde_json.workspace = truesha2.workspace = truesrp = { version = "0.7.0-rc.3", default-features = false }subtle = "2"+thiserror.workspace = true+urlencoding.workspace = trueuuid = { version = "1.11", features = ["js", "serde", "v4"] }zeroize.workspace = true-urlencoding.workspace = true[dev-dependencies]ente-test-support.workspace = truediff --git a/rust/crates/contacts/Cargo.toml b/rust/crates/contacts/Cargo.tomlindex 4277580f3b..135dc24eab 100644--- a/rust/crates/contacts/Cargo.toml+++ b/rust/crates/contacts/Cargo.toml@@ -8,11 +8,11 @@ museum = [][dependencies]ente-accounts.workspace = trueente-core.workspace = true+md-5.workspace = trueserde.workspace = trueserde_json.workspace = true-thiserror.workspace = true-md-5.workspace = truesha2.workspace = true+thiserror.workspace = trueuuid = { version = "1", features = ["v4", "js"] }[dev-dependencies]diff --git a/rust/crates/core/Cargo.toml b/rust/crates/core/Cargo.tomlindex b593b7d63a..fe3b213fb1 100644--- a/rust/crates/core/Cargo.toml+++ b/rust/crates/core/Cargo.toml@@ -3,34 +3,27 @@ name = "ente-core"edition = "2024"[dependencies]-reqwest = { version = "0.12", default-features = false, features = ["http2", "charset", "system-proxy", "json", "rustls-tls-native-roots", "rustls-tls-webpki-roots"] }-serde.workspace = true-serde_json.workspace = true-thiserror.workspace = true--# Pure Rust Cryptography-xsalsa20poly1305 = "0.9"-crypto_secretstream = "=0.2.0"-x25519-dalek = { version = "2.0", features = ["static_secrets"] }-salsa20 = "0.10"# Keep argon2 on stable 0.5.x for now. This retains a second digest 0.10# chain (via blake2 0.10) until argon2 0.6 reaches stable.argon2 = "0.5"+base64 = "0.22"blake2b_simd = "1.0"-rand_core = { version = "0.6", features = ["getrandom"] }-subtle = "2"-md-5.workspace = true--# Randomness-#+crypto_secretstream = "=0.2.0"# We enable `getrandom`'s `js` feature so that the crate works on# `wasm32-unknown-unknown` (it uses the browser's `crypto.getRandomValues`).# This also enables `rand_core::OsRng` on WASM.getrandom = { version = "0.2", features = ["js"] }--# Common dependencies-base64 = "0.22"log = "0.4"+md-5.workspace = true+rand_core = { version = "0.6", features = ["getrandom"] }+reqwest = { version = "0.12", default-features = false, features = ["http2", "charset", "system-proxy", "json", "rustls-tls-native-roots", "rustls-tls-webpki-roots"] }+salsa20 = "0.10"+serde.workspace = true+serde_json.workspace = true+subtle = "2"+thiserror.workspace = true+x25519-dalek = { version = "2.0", features = ["static_secrets"] }+xsalsa20poly1305 = "0.9"zeroize.workspace = true[target.'cfg(not(target_arch = "wasm32"))'.dependencies]diff --git a/rust/crates/image/Cargo.toml b/rust/crates/image/Cargo.tomlindex 876033c7c6..1951c8f7fe 100644--- a/rust/crates/image/Cargo.toml+++ b/rust/crates/image/Cargo.toml@@ -3,13 +3,13 @@ name = "ente-image"edition = "2024"[dependencies]+ente_heic = { package = "heic_decoder", git = "https://github.com/ente/heic-decoder.git", rev = "2017f4ddaf91017483f6eb71500f520fba47391a", features = [+ "image-integration",+] }fast_image_resize = { version = "5.5.0", features = ["image"] }image = { version = "0.25.10", default-features = true }jxl-oxide = { version = "0.12.6", features = ["image"] }kamadak-exif = "0.6.1"-ente_heic = { package = "heic_decoder", git = "https://github.com/ente/heic-decoder.git", rev = "2017f4ddaf91017483f6eb71500f520fba47391a", features = [- "image-integration",-] }moxcms = { version = "0.8.1", features = ["in_place"] }thiserror.workspace = truetiff = "0.10.3"diff --git a/rust/crates/photos/Cargo.toml b/rust/crates/photos/Cargo.tomlindex f117885330..82cf74f330 100644--- a/rust/crates/photos/Cargo.toml+++ b/rust/crates/photos/Cargo.toml@@ -8,20 +8,20 @@ ml-assets = [][dependencies]ente-image.workspace = true-quick-xml = "0.41"-# The FRB photos bridge calls the SimSIMD symbol exported by usearch 2.21.x.-# Newer usearch releases switched that implementation to numkong symbols.-usearch = "=2.21.4"fast_image_resize = { version = "5.5.0", features = ["image", "rayon"] }+half = "2.1"+html-escape = "0.2.13"image = { version = "0.25.5", default-features = true }imageproc = "0.25.0"nalgebra = "0.33.2"-half = "2.1"once_cell = "1.20.2"-regex = "1.11.1"-html-escape = "0.2.13"plsfix = "0.1.8"+quick-xml = "0.41"+regex = "1.11.1"thiserror.workspace = true+# The FRB photos bridge calls the SimSIMD symbol exported by usearch 2.21.x.+# Newer usearch releases switched that implementation to numkong symbols.+usearch = "=2.21.4"# ORT source and revision are pinned once in the workspace manifest; only the# per-target feature sets are declared here.