Merge pull request #190 from tnull/2023-11-upgrade-to-uniffi-0.25

Upgrade to Uniffi 0.25

Author: tnull

Cargo.toml

@@ -65,7 +65,7 @@ futures = "0.3"
 tokio = { version = "1", default-features = false, features = [ "rt-multi-thread", "time", "sync" ] }
 esplora-client = { version = "0.4", default-features = false }
 libc = "0.2"
-uniffi = { version = "0.23.0", features = ["build"], optional = true }
+uniffi = { version = "0.25.1", features = ["build"], optional = true }
 
 [target.'cfg(vss)'.dependencies]
 vss-client = "0.1"
@@ -82,7 +82,7 @@ proptest = "1.0.0"
 regex = "1.5.6"
 
 [build-dependencies]
-uniffi = { version = "0.23.0", features = ["build"], optional = true }
+uniffi = { version = "0.25.1", features = ["build"], optional = true }
 
 [profile.release]
 panic = "abort"

bindings/uniffi-bindgen/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = { version = "0.23.0", features = ["cli"] }
+uniffi = { version = "0.25.1", features = ["cli"] }

scripts/uniffi_bindgen_generate_kotlin_android.sh

@@ -9,9 +9,9 @@ LLVM_ARCH_PATH="darwin-x86_64"
 PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$LLVM_ARCH_PATH/bin:$PATH"
 
 rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
-CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android21-clang" CC="x86_64-linux-android21-clang" cargo build --profile release-smaller --features uniffi --target x86_64-linux-android || exit 1
-CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="armv7a-linux-androideabi21-clang" CC="armv7a-linux-androideabi21-clang" cargo build --profile release-smaller --features uniffi --target armv7-linux-androideabi || exit 1
-CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android21-clang" CC="aarch64-linux-android21-clang" cargo build --profile release-smaller --features uniffi --target aarch64-linux-android || exit 1
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android25-clang" CC="x86_64-linux-android25-clang" cargo build --profile release-smaller --features uniffi --target x86_64-linux-android || exit 1
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="armv7a-linux-androideabi25-clang" CC="armv7a-linux-androideabi25-clang" cargo build --profile release-smaller --features uniffi --target armv7-linux-androideabi || exit 1
+CFLAGS="-D__ANDROID_MIN_SDK_VERSION__=21" AR=llvm-ar CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android25-clang" CC="aarch64-linux-android25-clang" cargo build --profile release-smaller --features uniffi --target aarch64-linux-android || exit 1
 $UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language kotlin -o "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/kotlin || exit 1
 
 JNI_LIB_DIR="$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/jniLibs/ 

scripts/uniffi_bindgen_generate_swift.sh

@@ -8,19 +8,19 @@ $UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language swift -o "$BINDING
 mkdir -p $BINDINGS_DIR
 
 # Install rust target toolchains
-rustup install nightly-2023-04-10
-rustup component add rust-src --toolchain nightly-2023-04-10
-rustup target add aarch64-apple-ios x86_64-apple-ios
-rustup target add aarch64-apple-ios-sim --toolchain nightly-2023-04-10
-rustup target add aarch64-apple-darwin x86_64-apple-darwin
+rustup install 1.73.0
+rustup component add rust-src --toolchain 1.73.0
+rustup target add aarch64-apple-ios x86_64-apple-ios --toolchain 1.73.0
+rustup target add aarch64-apple-ios-sim --toolchain 1.73.0
+rustup target add aarch64-apple-darwin x86_64-apple-darwin --toolchain 1.73.0
 
 # Build rust target libs
 cargo build --profile release-smaller --features uniffi || exit 1
 cargo build --profile release-smaller --features uniffi --target x86_64-apple-darwin || exit 1
 cargo build --profile release-smaller --features uniffi --target aarch64-apple-darwin || exit 1
 cargo build --profile release-smaller --features uniffi --target x86_64-apple-ios || exit 1
 cargo build --profile release-smaller --features uniffi --target aarch64-apple-ios || exit 1
-cargo +nightly-2023-04-10 build --release --features uniffi --target aarch64-apple-ios-sim || exit 1
+cargo +1.73.0 build --release --features uniffi --target aarch64-apple-ios-sim || exit 1
 
 # Combine ios-sim and apple-darwin (macos) libs for x86_64 and aarch64 (m1)
 mkdir -p target/lipo-ios-sim/release-smaller || exit 1