Switch to Dart native assets

With the changes from
Uniffi-Dart/uniffi-dart#99, the native libraries
can be compiled automagically in a dart build hook.

Author: spacebear21

payjoin-ffi/Cargo.toml

@@ -22,7 +22,7 @@ name = "uniffi-bindgen"
 path = "uniffi-bindgen.rs"
 
 [build-dependencies]
-uniffi-dart = { git = "https://github.com/Uniffi-Dart/uniffi-dart.git", rev = "364b117", features = ["build"], optional = true }
+uniffi-dart = { git = "https://github.com/spacebear21/uniffi-dart.git", rev = "bdfc10a", features = ["build"], optional = true }
 uniffi = { version = "0.30.0", features = ["build", "cli"] }
 
 [dependencies]
@@ -38,7 +38,7 @@ serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
 thiserror = "2.0.14"
 tokio = { version = "1.47.1", features = ["full"], optional = true }
-uniffi-dart = { git = "https://github.com/Uniffi-Dart/uniffi-dart.git", rev = "364b117", optional = true }
+uniffi-dart = { git = "https://github.com/spacebear21/uniffi-dart.git", rev = "bdfc10a", optional = true }
 uniffi = { version = "0.30.0" }
 url = "2.5.4"
 

payjoin-ffi/dart/hook/build.dart

@@ -0,0 +1,12 @@
+import 'package:hooks/hooks.dart';
+import 'package:native_toolchain_rs/native_toolchain_rs.dart';
+
+void main(List<String> args) async {
+  await build(args, (input, output) async {
+    await const RustBuilder(
+      assetName: 'uniffi:payjoin_ffi',
+      cratePath: '..',
+      features: ['dart', '_test-utils'],
+    ).run(input: input, output: output);
+  });
+}

payjoin-ffi/dart/pubspec.yaml

@@ -3,10 +3,16 @@ description: Dart bindings for payjoin (EXPERIMENTAL)
 version: 0.1.0
 
 environment:
-  sdk: '^3.2.0'
+  sdk: '^3.10.0'
 
 dependencies:
   ffi: ^2.1.4
+  hooks: any
+  code_assets: any
+  native_toolchain_rs: ^1.0.0
 dev_dependencies:
   test: ^1.26.2
   http: ^1.4.0
+
+hooks:
+  build: hook/build.dart

payjoin-ffi/dart/scripts/generate_bindings.sh

@@ -22,26 +22,4 @@ echo "Generating payjoin dart..."
 cargo build --features dart,_test-utils --profile dev
 cargo run --features dart,_test-utils --profile dev --bin uniffi-bindgen -- --library ../target/debug/$LIBNAME --language dart --out-dir dart/lib/
 
-if [[ "$OS" == "Darwin" ]]; then
-    echo "Generating native binaries..."
-    rustup target add aarch64-apple-darwin x86_64-apple-darwin
-    # This is a test script the actual release should not include the test utils feature
-    cargo build --profile dev --target aarch64-apple-darwin --features dart,_test-utils &
-    cargo build --profile dev --target x86_64-apple-darwin --features dart,_test-utils &
-    wait
-
-    echo "Building macos fat library"
-    lipo -create -output dart/$LIBNAME \
-        ../target/aarch64-apple-darwin/debug/$LIBNAME \
-        ../target/x86_64-apple-darwin/debug/$LIBNAME
-else
-    echo "Generating native binaries..."
-    rustup target add x86_64-unknown-linux-gnu
-    # This is a test script the actual release should not include the test utils feature
-    cargo build --profile dev --target x86_64-unknown-linux-gnu --features dart,_test-utils
-
-    echo "Copying payjoin_ffi binary"
-    cp ../target/x86_64-unknown-linux-gnu/debug/$LIBNAME dart/$LIBNAME
-fi
-
 echo "All done!"

payjoin-ffi/rust-toolchain.toml

@@ -0,0 +1,27 @@
+[toolchain]
+channel = "1.85.1"
+
+# The targets you want to support; these are the default:
+targets = [
+  # Android
+  "armv7-linux-androideabi",
+  "aarch64-linux-android",
+  "x86_64-linux-android",
+
+  # iOS (device + simulator)
+  "aarch64-apple-ios",
+  "aarch64-apple-ios-sim",
+  "x86_64-apple-ios",
+
+  # Windows
+  "aarch64-pc-windows-msvc",
+  "x86_64-pc-windows-msvc",
+
+  # Linux
+  "aarch64-unknown-linux-gnu",
+  "x86_64-unknown-linux-gnu",
+
+  # macOS
+  "aarch64-apple-darwin",
+  "x86_64-apple-darwin",
+]

payjoin-ffi/uniffi-bindgen.rs

@@ -1,4 +1,6 @@
-fn main() { uniffi_bindgen() }
+fn main() {
+    uniffi_bindgen()
+}
 
 fn uniffi_bindgen() {
     // uniffi_bindgen_main parses command line arguments for officially supported languages,
@@ -21,7 +23,7 @@ fn uniffi_bindgen() {
                 .expect("--out-dir is required when using --library");
             uniffi_dart::gen::generate_dart_bindings(
                 "src/payjoin.udl".into(),
-                None,
+                Some("uniffi.toml".into()),
                 Some(output_dir.as_str().into()),
                 library_path.as_str().into(),
                 true,

payjoin-ffi/uniffi.toml

@@ -6,4 +6,8 @@ cdylib_name = "payjoin_ffi"
 cdylib_name = "payjoin_ffi"
 
 [bindings.swift]
-cdylib_name = "payjoin_ffi"
+cdylib_name = "payjoin_ffi"
+
+[bindings.dart]
+cdylib_name = "payjoin_ffi"
+package_name = "payjoin"