From bb2e8580e2a7a26982237c3dc2032510b6fb036a Mon Sep 17 00:00:00 2001 From: julian Date: Wed, 23 Oct 2024 10:30:20 -0600 Subject: [PATCH] build scripts update --- pubspec.lock | 10 +++++----- scripts/android/build_all.sh | 2 +- scripts/android/build_all_campfire.sh | 2 +- scripts/android/build_all_duo.sh | 2 +- scripts/app_config/templates/android/app/build.gradle | 4 ++++ scripts/ios/build_all.sh | 2 +- scripts/ios/build_all_campfire.sh | 2 +- scripts/ios/build_all_duo.sh | 2 +- scripts/linux/build_all.sh | 2 +- scripts/linux/build_all_campfire.sh | 2 +- scripts/linux/build_all_duo.sh | 2 +- scripts/macos/build_all.sh | 2 +- scripts/macos/build_all_campfire.sh | 2 +- scripts/macos/build_all_duo.sh | 2 +- scripts/windows/build_all.sh | 2 +- scripts/windows/build_all_campfire.sh | 2 +- scripts/windows/build_all_duo.sh | 2 +- 17 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index d436cea3d..e80f8df29 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1283,12 +1283,12 @@ packages: source: hosted version: "0.2.0" monero: - dependency: "direct main" + dependency: transitive description: - path: "." - ref: d46753eca865e9e56c2f0ef6fe485c42e11982c5 - resolved-ref: d46753eca865e9e56c2f0ef6fe485c42e11982c5 - url: "https://github.com/mrcyjanek/monero.dart" + path: "impls/monero.dart" + ref: d04dcf67ec042fca76b48ffc09ea9d2ea4b5106e + resolved-ref: d04dcf67ec042fca76b48ffc09ea9d2ea4b5106e + url: "https://github.com/cypherstack/monero_c" source: git version: "0.0.0" mutex: diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh index e9417b263..1969da151 100755 --- a/scripts/android/build_all.sh +++ b/scripts/android/build_all.sh @@ -14,7 +14,7 @@ PLUGINS_DIR=../../crypto_plugins (cd "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android && ./build_all.sh ) (cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh ) -(cd "${PLUGINS_DIR}"/cs_monero/tools/build_scripts && ./build_android.sh ) +(cd "${PLUGINS_DIR}"/cs_monero/tools/build_scripts && ./build_android.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh ) diff --git a/scripts/android/build_all_campfire.sh b/scripts/android/build_all_campfire.sh index e9417b263..1969da151 100755 --- a/scripts/android/build_all_campfire.sh +++ b/scripts/android/build_all_campfire.sh @@ -14,7 +14,7 @@ PLUGINS_DIR=../../crypto_plugins (cd "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android && ./build_all.sh ) (cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh ) -(cd "${PLUGINS_DIR}"/cs_monero/tools/build_scripts && ./build_android.sh ) +(cd "${PLUGINS_DIR}"/cs_monero/tools/build_scripts && ./build_android.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh ) diff --git a/scripts/android/build_all_duo.sh b/scripts/android/build_all_duo.sh index f184a71dd..a4f7bd30f 100755 --- a/scripts/android/build_all_duo.sh +++ b/scripts/android/build_all_duo.sh @@ -16,7 +16,7 @@ PLUGINS_DIR=../../crypto_plugins (cd "${PLUGINS_DIR}"/flutter_liblelantus/scripts/android && ./build_all.sh ) (cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh ) -(cd "${PLUGINS_DIR}"/cs_monero/tools/build_scripts && ./build_android.sh ) +(cd "${PLUGINS_DIR}"/cs_monero/tools/build_scripts && ./build_android.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh ) diff --git a/scripts/app_config/templates/android/app/build.gradle b/scripts/app_config/templates/android/app/build.gradle index 60e622ec9..b9cebc7b4 100644 --- a/scripts/app_config/templates/android/app/build.gradle +++ b/scripts/app_config/templates/android/app/build.gradle @@ -37,6 +37,10 @@ android { coreLibraryDesugaringEnabled true } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17 + } + dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") } diff --git a/scripts/ios/build_all.sh b/scripts/ios/build_all.sh index 74e9721fa..eafccf91b 100755 --- a/scripts/ios/build_all.sh +++ b/scripts/ios/build_all.sh @@ -16,7 +16,7 @@ rustup target add x86_64-apple-ios (cd ../../crypto_plugins/flutter_liblelantus/scripts/ios && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_ios.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_ios.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) diff --git a/scripts/ios/build_all_campfire.sh b/scripts/ios/build_all_campfire.sh index 74e9721fa..eafccf91b 100755 --- a/scripts/ios/build_all_campfire.sh +++ b/scripts/ios/build_all_campfire.sh @@ -16,7 +16,7 @@ rustup target add x86_64-apple-ios (cd ../../crypto_plugins/flutter_liblelantus/scripts/ios && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_ios.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_ios.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) diff --git a/scripts/ios/build_all_duo.sh b/scripts/ios/build_all_duo.sh index bef08e8c8..d10b4e340 100755 --- a/scripts/ios/build_all_duo.sh +++ b/scripts/ios/build_all_duo.sh @@ -18,7 +18,7 @@ rustup target add x86_64-apple-ios (cd ../../crypto_plugins/flutter_liblelantus/scripts/ios && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_ios.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_ios.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) diff --git a/scripts/linux/build_all.sh b/scripts/linux/build_all.sh index d541cc34f..b78bb46a1 100755 --- a/scripts/linux/build_all.sh +++ b/scripts/linux/build_all.sh @@ -14,7 +14,7 @@ mkdir -p build ./build_secure_storage_deps.sh (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_linux.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_linux.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh ) diff --git a/scripts/linux/build_all_campfire.sh b/scripts/linux/build_all_campfire.sh index d541cc34f..c15056ead 100755 --- a/scripts/linux/build_all_campfire.sh +++ b/scripts/linux/build_all_campfire.sh @@ -14,7 +14,7 @@ mkdir -p build ./build_secure_storage_deps.sh (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_linux.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_linux.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh ) diff --git a/scripts/linux/build_all_duo.sh b/scripts/linux/build_all_duo.sh index 5dc0e5bb0..786f10e8d 100755 --- a/scripts/linux/build_all_duo.sh +++ b/scripts/linux/build_all_duo.sh @@ -16,7 +16,7 @@ mkdir -p build ./build_secure_storage_deps.sh & (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_linux.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_linux.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh ) diff --git a/scripts/macos/build_all.sh b/scripts/macos/build_all.sh index 1636db4d3..b16a57f50 100755 --- a/scripts/macos/build_all.sh +++ b/scripts/macos/build_all.sh @@ -8,7 +8,7 @@ set_rust_to_1671 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_macos.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_macos.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) diff --git a/scripts/macos/build_all_campfire.sh b/scripts/macos/build_all_campfire.sh index 1636db4d3..5a42d97ea 100755 --- a/scripts/macos/build_all_campfire.sh +++ b/scripts/macos/build_all_campfire.sh @@ -8,7 +8,7 @@ set_rust_to_1671 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_macos.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_macos.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) diff --git a/scripts/macos/build_all_duo.sh b/scripts/macos/build_all_duo.sh index 7cc31c9d1..fe431e058 100755 --- a/scripts/macos/build_all_duo.sh +++ b/scripts/macos/build_all_duo.sh @@ -10,7 +10,7 @@ set_rust_to_1671 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_macos.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_macos.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) diff --git a/scripts/windows/build_all.sh b/scripts/windows/build_all.sh index d63e408ce..6bae6d700 100755 --- a/scripts/windows/build_all.sh +++ b/scripts/windows/build_all.sh @@ -9,7 +9,7 @@ set_rust_to_1671 mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) (cd ../../crypto_plugins/flutter_liblelantus/scripts/windows && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_windows.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_windows.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/windows && ./build_all.sh ) diff --git a/scripts/windows/build_all_campfire.sh b/scripts/windows/build_all_campfire.sh index d63e408ce..6bae6d700 100755 --- a/scripts/windows/build_all_campfire.sh +++ b/scripts/windows/build_all_campfire.sh @@ -9,7 +9,7 @@ set_rust_to_1671 mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) (cd ../../crypto_plugins/flutter_liblelantus/scripts/windows && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_windows.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_windows.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/windows && ./build_all.sh ) diff --git a/scripts/windows/build_all_duo.sh b/scripts/windows/build_all_duo.sh index 7226c4e41..0f504efe6 100755 --- a/scripts/windows/build_all_duo.sh +++ b/scripts/windows/build_all_duo.sh @@ -11,7 +11,7 @@ set_rust_to_1671 mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) (cd ../../crypto_plugins/flutter_liblelantus/scripts/windows && ./build_all.sh ) -(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_windows.sh ) +(cd ../../crypto_plugins/cs_monero/tools/build_scripts && ./build_windows.sh && ../copy_outputs_to_cs_monero_flutter_libs_package.sh ) set_rust_to_1720 (cd ../../crypto_plugins/frostdart/scripts/windows && ./build_all.sh )