Merge branch 'staging' into fix/android-ci-use-android-image

Author: julian-CStack

pubspec.lock

@@ -351,7 +351,7 @@ packages:
       path: coinlib
       ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
       resolved-ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
-      url: "https://www.github.com/julian-CStack/coinlib"
+      url: "https://github.com/cypherstack/coinlib"
     source: git
     version: "4.1.0"
   coinlib_flutter:
@@ -360,7 +360,7 @@ packages:
       path: coinlib_flutter
       ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
       resolved-ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
-      url: "https://www.github.com/julian-CStack/coinlib"
+      url: "https://github.com/cypherstack/coinlib"
     source: git
     version: "4.0.0"
   collection:

scripts/android/build_all.sh

@@ -2,21 +2,27 @@
 
 set -x -e
 
+APP="${1:-stack_wallet}"
+
 mkdir -p build
 . ./config.sh
 
 PLUGINS_DIR=../../crypto_plugins
 
-# libepiccash requires old rust
 source ../rust_version.sh
-set_rust_version_for_libepiccash
-(cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh )
-set_rust_version_for_libmwc
-(cd "${PLUGINS_DIR}"/flutter_libmwc/scripts/android && ./build_all.sh )
-# set rust (back) to a more recent stable release after building epiccash
+
+if [[ "$APP" = "stack_wallet" ]]; then
+    set_rust_version_for_libepiccash
+    (cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh )
+    set_rust_version_for_libmwc
+    (cd "${PLUGINS_DIR}"/flutter_libmwc/scripts/android && ./build_all.sh )
+fi
+
 set_rust_to_everything_else
 
-(cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh )
+if [[ "$APP" = "stack_wallet" || "$APP" = "stack_duo" ]]; then
+    (cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh )
+fi
 
 wait
 echo "Done building"

scripts/android/build_all_campfire.sh

@@ -218,7 +218,7 @@ dependencies:
   meta: ^1.9.1
   coinlib_flutter:
     git:
-      url: https://www.github.com/julian-CStack/coinlib
+      url: https://github.com/cypherstack/coinlib
       path: coinlib_flutter
       ref: 5c59c7e7d120d9c981f23008fa03421d39fe8631
   electrum_adapter:
@@ -316,7 +316,7 @@ dependency_overrides:
   # coinlib_flutter requires this
   coinlib:
     git:
-      url: https://www.github.com/julian-CStack/coinlib
+      url: https://github.com/cypherstack/coinlib
       path: coinlib
       ref: 5c59c7e7d120d9c981f23008fa03421d39fe8631
 

scripts/android/build_all_duo.sh

@@ -119,16 +119,7 @@ if [ "$BUILD_CRYPTO_PLUGINS" -eq 0 ]; then
     if [ "$DOWNLOAD_CRYPTO_PLUGINS" -eq 1 ]; then
         ./download_all.sh "$APP_NAMED_ID"
     else
-        if [[ "$APP_NAMED_ID" = "stack_wallet" ]]; then
-            ./build_all.sh
-        elif [[ "$APP_NAMED_ID" = "stack_duo" ]]; then
-            ./build_all_duo.sh
-        elif [[ "$APP_NAMED_ID" = "campfire" ]]; then
-            ./build_all_campfire.sh
-        else
-            echo "Invalid app id: ${APP_NAMED_ID}"
-            exit 1
-        fi
+        ./build_all.sh "$APP_NAMED_ID"
     fi
 fi
 

scripts/app_config/templates/pubspec.template.yaml

@@ -2,28 +2,26 @@
 
 set -x -e
 
-# ensure ios rust triples are there
-rustup target add aarch64-apple-ios
-rustup target add x86_64-apple-ios
+APP="${1:-stack_wallet}"
 
 # ensure ios rust triples are there
 rustup target add aarch64-apple-ios
 rustup target add x86_64-apple-ios
 
-# libepiccash requires old rust
 source ../rust_version.sh
-set_rust_version_for_libepiccash
-(cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh )
-set_rust_version_for_libmwc
-(cd ../../crypto_plugins/flutter_libmwc/scripts/ios/ && ./build_all.sh )
-# set rust (back) to a more recent stable release after building epiccash
+
+if [[ "$APP" = "stack_wallet" ]]; then
+    set_rust_version_for_libepiccash
+    (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh )
+    set_rust_version_for_libmwc
+    (cd ../../crypto_plugins/flutter_libmwc/scripts/ios/ && ./build_all.sh )
+fi
+
 set_rust_to_everything_else
 
-(cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh )
+if [[ "$APP" = "stack_wallet" || "$APP" = "stack_duo" ]]; then
+    (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh )
+fi
 
 wait
 echo "Done building"
-
-# ensure ios rust triples are there
-rustup target add aarch64-apple-ios
-rustup target add x86_64-apple-ios

scripts/build_app.sh

@@ -2,23 +2,29 @@
 
 set -x -e
 
+APP="${1:-stack_wallet}"
+
 # for arm
 # flutter-elinux clean
 # flutter-elinux pub get
 # flutter-elinux build linux --dart-define="IS_ARM=true"
 mkdir -p build
 ./build_secure_storage_deps.sh
 
-# libepiccash requires old rust
 source ../rust_version.sh
-set_rust_version_for_libepiccash
-(cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh )
-set_rust_version_for_libmwc
-(cd ../../crypto_plugins/flutter_libmwc/scripts/linux && ./build_all.sh )
-# set rust (back) to a more recent stable release after building epiccash
+
+if [[ "$APP" = "stack_wallet" ]]; then
+    set_rust_version_for_libepiccash
+    (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh )
+    set_rust_version_for_libmwc
+    (cd ../../crypto_plugins/flutter_libmwc/scripts/linux && ./build_all.sh )
+fi
+
 set_rust_to_everything_else
 
-(cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh )
+if [[ "$APP" = "stack_wallet" || "$APP" = "stack_duo" ]]; then
+    (cd ../../crypto_plugins/frostdart/scripts/linux && ./build_all.sh )
+fi
 
 ./build_secp256k1.sh