From d789ae120bf1b689b794b9733e1d6395de42c0c1 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Wed, 26 Mar 2025 13:47:55 -0500 Subject: [PATCH 1/3] feat: use NDK 28, fix epic on android, remove automatic cbindgen use --- crypto_plugins/flutter_libepiccash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libepiccash b/crypto_plugins/flutter_libepiccash index 8830be2ba..569dce4b6 160000 --- a/crypto_plugins/flutter_libepiccash +++ b/crypto_plugins/flutter_libepiccash @@ -1 +1 @@ -Subproject commit 8830be2ba661828d743be12df6f33d560448ed6a +Subproject commit 569dce4b6e21ce93c5e85789b29319b7bdc4629b From dabb2aa1b317269ce584c0672181218e3ca02c9d Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 24 Mar 2025 16:49:02 -0500 Subject: [PATCH 2/3] fix: update scripts and docs re: rust verion, ie 1.67.1->1.81 --- scripts/android/build_all.sh | 2 +- scripts/android/build_all_campfire.sh | 3 +-- scripts/android/build_all_duo.sh | 3 +-- scripts/ios/build_all.sh | 3 +-- scripts/ios/build_all_campfire.sh | 3 +-- scripts/ios/build_all_duo.sh | 3 +-- scripts/linux/build_all.sh | 3 +-- scripts/linux/build_all_campfire.sh | 3 +-- scripts/linux/build_all_duo.sh | 3 +-- scripts/macos/build_all.sh | 3 +-- scripts/macos/build_all_campfire.sh | 3 +-- scripts/macos/build_all_duo.sh | 3 +-- scripts/rust_version.sh | 11 ++++++++++- scripts/windows/build_all.sh | 3 +-- scripts/windows/build_all_campfire.sh | 3 +-- scripts/windows/build_all_duo.sh | 3 +-- 16 files changed, 25 insertions(+), 30 deletions(-) diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh index 60aa13c6a..47c36fd79 100755 --- a/scripts/android/build_all.sh +++ b/scripts/android/build_all.sh @@ -4,7 +4,7 @@ set -x -e # libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 mkdir -p build . ./config.sh diff --git a/scripts/android/build_all_campfire.sh b/scripts/android/build_all_campfire.sh index 60aa13c6a..ccb8830b1 100755 --- a/scripts/android/build_all_campfire.sh +++ b/scripts/android/build_all_campfire.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 mkdir -p build . ./config.sh diff --git a/scripts/android/build_all_duo.sh b/scripts/android/build_all_duo.sh index d67e700a8..cd1ba0174 100755 --- a/scripts/android/build_all_duo.sh +++ b/scripts/android/build_all_duo.sh @@ -4,9 +4,8 @@ set -x -e # todo: revisit following at some point -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 mkdir -p build . ./config.sh diff --git a/scripts/ios/build_all.sh b/scripts/ios/build_all.sh index bcb03e991..b9eab976f 100755 --- a/scripts/ios/build_all.sh +++ b/scripts/ios/build_all.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 # ensure ios rust triples are there rustup target add aarch64-apple-ios diff --git a/scripts/ios/build_all_campfire.sh b/scripts/ios/build_all_campfire.sh index bcb03e991..b9eab976f 100755 --- a/scripts/ios/build_all_campfire.sh +++ b/scripts/ios/build_all_campfire.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 # ensure ios rust triples are there rustup target add aarch64-apple-ios diff --git a/scripts/ios/build_all_duo.sh b/scripts/ios/build_all_duo.sh index 89e6f4641..24236e8a7 100755 --- a/scripts/ios/build_all_duo.sh +++ b/scripts/ios/build_all_duo.sh @@ -4,9 +4,8 @@ set -x -e # todo: revisit following at some point -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 # ensure ios rust triples are there rustup target add aarch64-apple-ios diff --git a/scripts/linux/build_all.sh b/scripts/linux/build_all.sh index 423646185..bdb3bd527 100755 --- a/scripts/linux/build_all.sh +++ b/scripts/linux/build_all.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 # for arm # flutter-elinux clean diff --git a/scripts/linux/build_all_campfire.sh b/scripts/linux/build_all_campfire.sh index 423646185..bdb3bd527 100755 --- a/scripts/linux/build_all_campfire.sh +++ b/scripts/linux/build_all_campfire.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 # for arm # flutter-elinux clean diff --git a/scripts/linux/build_all_duo.sh b/scripts/linux/build_all_duo.sh index 78067b478..91d2127cd 100755 --- a/scripts/linux/build_all_duo.sh +++ b/scripts/linux/build_all_duo.sh @@ -4,9 +4,8 @@ set -x -e # todo: revisit following at some point -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 # for arm # flutter-elinux clean diff --git a/scripts/macos/build_all.sh b/scripts/macos/build_all.sh index af608846f..2212929e8 100755 --- a/scripts/macos/build_all.sh +++ b/scripts/macos/build_all.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) diff --git a/scripts/macos/build_all_campfire.sh b/scripts/macos/build_all_campfire.sh index af608846f..2212929e8 100755 --- a/scripts/macos/build_all_campfire.sh +++ b/scripts/macos/build_all_campfire.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) diff --git a/scripts/macos/build_all_duo.sh b/scripts/macos/build_all_duo.sh index 8a53e5801..f4114c7ef 100755 --- a/scripts/macos/build_all_duo.sh +++ b/scripts/macos/build_all_duo.sh @@ -4,9 +4,8 @@ set -x -e # todo: revisit following at some point -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) diff --git a/scripts/rust_version.sh b/scripts/rust_version.sh index 8cda1229b..8cfada233 100755 --- a/scripts/rust_version.sh +++ b/scripts/rust_version.sh @@ -16,4 +16,13 @@ set_rust_to_1720() { echo "Rust version 1.72.0 is not installed. Please install it using 'rustup install 1.72.0'." >&2 exit 1 fi -} \ No newline at end of file +} + +set_rust_to_181() { + if rustup toolchain list | grep -q "1.81"; then + rustup default 1.81 + else + echo "Rust version 1.81 is not installed. Please install it using 'rustup install 1.81'." >&2 + exit 1 + fi +} diff --git a/scripts/windows/build_all.sh b/scripts/windows/build_all.sh index 191a46cc0..6daedb861 100755 --- a/scripts/windows/build_all.sh +++ b/scripts/windows/build_all.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) diff --git a/scripts/windows/build_all_campfire.sh b/scripts/windows/build_all_campfire.sh index 191a46cc0..6daedb861 100755 --- a/scripts/windows/build_all_campfire.sh +++ b/scripts/windows/build_all_campfire.sh @@ -2,9 +2,8 @@ set -x -e -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) diff --git a/scripts/windows/build_all_duo.sh b/scripts/windows/build_all_duo.sh index 3e27eff02..f6ce810ef 100755 --- a/scripts/windows/build_all_duo.sh +++ b/scripts/windows/build_all_duo.sh @@ -4,9 +4,8 @@ set -x -e # todo: revisit following at some point -# libepiccash requires old rust source ../rust_version.sh -set_rust_to_1671 +set_rust_to_181 mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) From 6f8c6003d1b980dd6c0ff7a6ceae90185deca6fe Mon Sep 17 00:00:00 2001 From: sneurlax Date: Wed, 26 Mar 2025 23:47:14 -0500 Subject: [PATCH 3/3] fix: Windows Epic example and build scripts --- crypto_plugins/flutter_libepiccash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libepiccash b/crypto_plugins/flutter_libepiccash index 569dce4b6..238455f2b 160000 --- a/crypto_plugins/flutter_libepiccash +++ b/crypto_plugins/flutter_libepiccash @@ -1 +1 @@ -Subproject commit 569dce4b6e21ce93c5e85789b29319b7bdc4629b +Subproject commit 238455f2b3fe39564cc617ed0ea45f22971aa644