Update flutter_rust_bridge to 2.7.0 (#642)

* Suppress no-nullability-completeness errors * Use 'dart run' instead of the deprecated 'flutter pub run' cmd * Update flutter_rust_bridge to version 2.7.0 Set flutter_rust_bridge range to ">=2.4.0 <=2.7.0" on Dart plugin. * Generate Dart bindings * Update Flutter to latest version * Update melos to latest version * Make Flutter plugin compatible with AGP 8.+ - Declare 'namespace' property on module-level build script - Change default namespace - Remove package name from AndroidManifest - Bump compileSdkVersion to latest - Update source and target compatibility warning: [options] source value 8 is obsolete and will be removed in a future release warning: [options] target value 8 is obsolete and will be removed in a future release
breez · Jan 7, 2025 · 1695c88 · 1695c88
1 parent eadcdbf
commit 1695c88
Show file tree

Hide file tree

Showing 22 changed files with 80 additions and 148 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -260,7 +260,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.22.3 # Pinned until resource linking issues on Android is resolved with 3.24
+          flutter-version: 3.27.1
       - run: flutter --version
 
       - name: Set up just

diff --git a/.github/workflows/publish-flutter.yml b/.github/workflows/publish-flutter.yml
@@ -50,7 +50,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
-          flutter-version: 3.22.3 # Pinned until resource linking issues on Android is resolved with 3.24
+          flutter-version: 3.27.1
 
       - name: Copy package files
         working-directory: dist

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/lib/Cargo.lock b/lib/Cargo.lock
diff --git a/lib/bindings/langs/flutter/justfile b/lib/bindings/langs/flutter/justfile
@@ -22,7 +22,7 @@ clean:
 # Install flutter_rust_bridge_codegen dependencies
 frb:
 	cargo install cargo-expand
-	cargo install flutter_rust_bridge_codegen --version 2.4.0
+	cargo install flutter_rust_bridge_codegen --version 2.7.0
 	dart pub global activate ffigen
 	dart pub global activate ffi
 	cargo install cargo-xcode
@@ -78,7 +78,7 @@ build-ios-framework:
 
 # Generate FFI bindings
 ffigen:
-	cd ../../../../packages/flutter/ && flutter pub run ffigen --config ffigen.yaml && dart format -l 110 ./lib/flutter_breez_liquid_bindings_generated.dart
+	cd ../../../../packages/flutter/ && dart run ffigen --config ffigen.yaml && dart format -l 110 ./lib/flutter_breez_liquid_bindings_generated.dart
 
 # (melos) Analyze & check the format of packages in workspace
 check:

diff --git a/lib/bindings/langs/flutter/pubspec.lock b/lib/bindings/langs/flutter/pubspec.lock
@@ -25,14 +25,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
   charcode:
     dependency: transitive
     description:
@@ -41,6 +33,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   cli_launcher:
     dependency: transitive
     description:
@@ -153,22 +153,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.16+1"
   melos:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: a3f06ed871e0348cb99909ad5ddf5f8b53cc61d894c302b5417d2db1ee7ec381
+      sha256: c52e27c0b291e42180aff81cbf5bc6028099e065cfd4e5f9a4095ab603dfd711
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.3.0"
   meta:
     dependency: transitive
     description:
@@ -241,22 +233,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.0"
-  pubspec:
-    dependency: transitive
-    description:
-      name: pubspec
-      sha256: f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  quiver:
+  pubspec_parse:
     dependency: transitive
     description:
-      name: quiver
-      sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2
+      name: pubspec_parse
+      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "1.4.0"
   source_span:
     dependency: transitive
     description:
@@ -273,14 +257,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.11.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -297,14 +273,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.3"
   typed_data:
     dependency: transitive
     description:
@@ -313,14 +281,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
-  uri:
-    dependency: transitive
-    description:
-      name: uri
-      sha256: "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   web:
     dependency: transitive
     description:

diff --git a/lib/bindings/langs/flutter/pubspec.yaml b/lib/bindings/langs/flutter/pubspec.yaml
@@ -3,5 +3,5 @@ name: breez_sdk_liquid_workspace
 environment:
   sdk: '>=3.4.0 <4.0.0'
 dev_dependencies:
-  melos: ^6.1.0
+  melos: ^6.3.0
   lints: ^4.0.0
diff --git a/lib/core/Cargo.toml b/lib/core/Cargo.toml
@@ -20,7 +20,7 @@ bip39 = "2.0.0"
 boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust", branch = "trunk" }
 chrono = "0.4"
 env_logger = "0.11"
-flutter_rust_bridge = { version = "=2.4.0", features = [
+flutter_rust_bridge = { version = "=2.7.0", features = [
     "chrono",
 ], optional = true }
 log = { workspace = true }
@@ -30,7 +30,9 @@ lwk_wollet = { git = "https://github.com/dangeross/lwk", branch = "savage-full-s
 #lwk_wollet = "0.7.0"
 rusqlite = { version = "0.31", features = ["backup", "bundled"] }
 rusqlite_migration = "1.0"
-sdk-common = { git = "https://github.com/breez/breez-sdk", rev = "e0f2548b4ba917e69c532eb9ff900b64ed9a3da3", features = ["liquid"] }
+sdk-common = { git = "https://github.com/breez/breez-sdk", rev = "e0f2548b4ba917e69c532eb9ff900b64ed9a3da3", features = [
+    "liquid",
+] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.116"
 strum = "0.25"

diff --git a/lib/core/src/frb_generated.rs b/lib/core/src/frb_generated.rs
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.4.0.
+// @generated by `flutter_rust_bridge`@ 2.7.0.
 
 #![allow(
     non_camel_case_types,
@@ -38,7 +38,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
     default_rust_opaque = RustOpaqueNom,
     default_rust_auto_opaque = RustAutoOpaqueNom,
 );
-pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.4.0";
+pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.7.0";
 pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -2032324171;
 
 // Section: executor
@@ -1572,7 +1572,7 @@ fn wire__crate__bindings__BindingLiquidSdk_sync_impl(
 ) {
     FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::DcoCodec, _, _, _>(
         flutter_rust_bridge::for_generated::TaskInfo {
-            debug_name: "BindingLiquidSdk_sync",
+            debug_name: "BindingLiquidSdk_sync(dart_style=sync)",
             port: Some(port_),
             mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
         },
@@ -8380,7 +8380,7 @@ impl SseEncode for usize {
 #[cfg(not(target_family = "wasm"))]
 mod io {
     // This file is automatically generated, so please do not edit it.
-    // @generated by `flutter_rust_bridge`@ 2.4.0.
+    // @generated by `flutter_rust_bridge`@ 2.7.0.
 
     // Section: imports
 

diff --git a/packages/dart/lib/src/bindings.dart b/packages/dart/lib/src/bindings.dart
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.4.0.
+// @generated by `flutter_rust_bridge`@ 2.7.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

diff --git a/packages/dart/lib/src/bindings/duplicates.dart b/packages/dart/lib/src/bindings/duplicates.dart
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.4.0.
+// @generated by `flutter_rust_bridge`@ 2.7.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

diff --git a/packages/dart/lib/src/error.dart b/packages/dart/lib/src/error.dart
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.4.0.
+// @generated by `flutter_rust_bridge`@ 2.7.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import