π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Upgrade Flutter Rust Bridge to 2.13
Manav Rathie6109a0f9942
diff --git a/mobile/apps/locker/pubspec.yaml b/mobile/apps/locker/pubspec.yamlindex 891a5c86db..af9103939d 100644--- a/mobile/apps/locker/pubspec.yaml+++ b/mobile/apps/locker/pubspec.yaml@@ -75,7 +75,7 @@ dependencies:flutter_displaymode: 0.6.0flutter_localizations:sdk: flutter- flutter_rust_bridge: 2.12.0+ flutter_rust_bridge: 2.13.0flutter_svg: 2.3.0freezed_annotation: 3.1.0hugeicons: 1.1.7diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yamlindex 4c5b15f8f3..1c74e85dc7 100644--- a/mobile/apps/photos/pubspec.yaml+++ b/mobile/apps/photos/pubspec.yaml@@ -112,7 +112,7 @@ dependencies:flutter_localizations:sdk: flutterflutter_map: 8.3.1- flutter_rust_bridge: 2.12.0+ flutter_rust_bridge: 2.13.0# Version 9.2.4 leaves lock-screen keys behind after an app reinstall.# Upgrade only after this is fixed or with a migration.# https://github.com/juliansteenbakker/flutter_secure_storage/issues/870#issuecomment-2777447937diff --git a/mobile/packages/frb/pubspec.yaml b/mobile/packages/frb/pubspec.yamlindex 89c9a8196a..3b2a2da254 100644--- a/mobile/packages/frb/pubspec.yaml+++ b/mobile/packages/frb/pubspec.yaml@@ -7,5 +7,5 @@ environment:sdk: ">=3.10.0 <4.0.0"dependencies:- flutter_rust_bridge: 2.12.0+ flutter_rust_bridge: 2.13.0freezed_annotation: 3.1.0diff --git a/mobile/pubspec.lock b/mobile/pubspec.lockindex f293a8f959..bd5ebb379a 100644--- a/mobile/pubspec.lock+++ b/mobile/pubspec.lock@@ -1031,10 +1031,10 @@ packages:dependency: transitivedescription:name: flutter_rust_bridge- sha256: e87d6b9ee934dcd24a128ccb2bd91905d2d5fe5c06245d6a8f5477d4907a437a+ sha256: ec69331e2335ab4d456c0a9fc700892c2c85b72b9c0cb39df3ecfe8833d5d5c8url: "https://pub.dev"source: hosted- version: "2.12.0"+ version: "2.13.0"flutter_secure_storage:dependency: transitivedescription:diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex c4127ac674..dbe46f253a 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -3343,9 +3343,9 @@ checksum = "37007738a80ea34f969af54a3390dd72cacdef654974cfd449c9f6f72dbaac10"[[package]]name = "flutter_rust_bridge"-version = "2.12.0"+version = "2.13.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a0884853aae8a6517b5b58cf36f55da487f2fe110e1686938eb29b6640aae4a5"+checksum = "24a973d15b8fc7de9fb29cdfbec58a2ac41f6252492d3b882abfdc603e32b34f"dependencies = ["allo-isolate","android_logger",@@ -3372,9 +3372,9 @@ dependencies = [[[package]]name = "flutter_rust_bridge_codegen"-version = "2.12.0"+version = "2.13.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "13823e8157bada9dc828d67cd23e4bcebcfffa9313175dacad0325fc3188940c"+checksum = "701a8e577f9f5f59f651e1e932add36ee5dfb82d0fa20215225ea177d4dbbe4b"dependencies = ["anyhow","cargo_metadata 0.14.2",@@ -3402,6 +3402,7 @@ dependencies = ["proc-macro2","quote","regex",+ "semver","serde","serde_json","serde_yaml",@@ -3417,9 +3418,9 @@ dependencies = [[[package]]name = "flutter_rust_bridge_macros"-version = "2.12.0"+version = "2.13.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6b5ce32f35f710ced8c5aa557f023f1a624e737b5460cee2b70fcd3a8df09e1b"+checksum = "901eec2d226107dad1c55b30f7421c4687bebcf70ed43ca44d1b447ca087b238"dependencies = ["hex","md-5 0.10.6",diff --git a/rust/Cargo.toml b/rust/Cargo.tomlindex 055168913f..f721c607e9 100644--- a/rust/Cargo.toml+++ b/rust/Cargo.toml@@ -81,8 +81,8 @@ ente-vecdb = { path = "crates/vecdb" }ente-wasm-lib = { path = "bindings/wasm/lib" }fast_image_resize = { version = "5.5.0", features = ["image"] }flate2 = "1.1.9"-flutter_rust_bridge = "=2.12.0"-flutter_rust_bridge_codegen = "=2.12.0"+flutter_rust_bridge = "=2.13.0"+flutter_rust_bridge_codegen = "=2.13.0"futures-util = "0.3.32"getrandom = { version = "0.4.0", features = ["wasm_js"] }hkdf = "0.13.0"diff --git a/rust/tools/codegen/src/main.rs b/rust/tools/codegen/src/main.rsindex 641d740cc9..a6336cc337 100644--- a/rust/tools/codegen/src/main.rs+++ b/rust/tools/codegen/src/main.rs@@ -237,6 +237,7 @@ fn generate_frb_package(package_dir: &Path) -> Result<(), DynError> {let result = FrbConfig::from_files_auto().and_then(|config| {let config = FrbConfig::merge(FrbConfig {+ build_runner: Some(false),dart_fix: Some(false),..Default::default()},@@ -254,7 +255,12 @@ fn generate_frb_package(package_dir: &Path) -> Result<(), DynError> {result?;- Ok(())+ run_command(+ Command::new(if cfg!(windows) { "dart.bat" } else { "dart" })+ .args(["run", "build_runner", "build"])+ .current_dir(package_dir),+ format!("failed to generate Dart code in {}", package_dir.display()),+ )}fn generate_napi() -> Result<(), DynError> {