Skip to content

Commit 505d15d

Browse files
julian-CStackjulian-CStack
committed
Merge remote-tracking branch 'origin/staging' into julian/testing2
2 parents cfb37fe + afb40b8 commit 505d15d

30 files changed

Lines changed: 160 additions & 306 deletions

‎.github/workflows/build.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
contents: read
103103
packages: read
104104
container:
105-
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
105+
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
106106
credentials:
107107
username: ${{ github.actor }}
108108
password: ${{ github.token }}
@@ -743,7 +743,7 @@ jobs:
743743
contents: read
744744
packages: read
745745
container:
746-
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
746+
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
747747
credentials:
748748
username: ${{ github.actor }}
749749
password: ${{ github.token }}
@@ -1201,7 +1201,7 @@ jobs:
12011201
contents: read
12021202
packages: read
12031203
container:
1204-
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
1204+
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
12051205
credentials:
12061206
username: ${{ github.actor }}
12071207
password: ${{ github.token }}

‎Dockerfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
6363
&& sdkmanager \
6464
"platform-tools" \
6565
"build-tools;35.0.0" \
66+
"platforms;android-32" \
67+
"platforms;android-33" \
68+
"platforms;android-34" \
6669
"platforms;android-35" \
70+
"platforms;android-36" \
71+
"ndk;28.0.13004108" \
6772
"ndk;28.2.13676358" \
73+
"cmake;3.22.1" \
6874
&& chmod -R a+rwX "$ANDROID_SDK_ROOT"
6975

7076
ENV PATH=/usr/local/go/bin:$PATH
@@ -142,8 +148,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
142148
&& sdkmanager \
143149
"platform-tools" \
144150
"build-tools;35.0.0" \
151+
"platforms;android-32" \
152+
"platforms;android-33" \
153+
"platforms;android-34" \
145154
"platforms;android-35" \
155+
"platforms;android-36" \
156+
"ndk;28.0.13004108" \
146157
"ndk;28.2.13676358" \
158+
"cmake;3.22.1" \
147159
&& chmod -R a+rwX "$ANDROID_SDK_ROOT"
148160

149161
ENV PATH=/usr/local/go/bin:$PATH

‎crypto_plugins/frostdart‎

‎pubspec.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ packages:
351351
path: coinlib
352352
ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
353353
resolved-ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
354-
url: "https://www.github.com/julian-CStack/coinlib"
354+
url: "https://github.com/cypherstack/coinlib"
355355
source: git
356356
version: "4.1.0"
357357
coinlib_flutter:
@@ -360,7 +360,7 @@ packages:
360360
path: coinlib_flutter
361361
ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
362362
resolved-ref: "5c59c7e7d120d9c981f23008fa03421d39fe8631"
363-
url: "https://www.github.com/julian-CStack/coinlib"
363+
url: "https://github.com/cypherstack/coinlib"
364364
source: git
365365
version: "4.0.0"
366366
collection:

‎scripts/android/build_all.sh‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@
22

33
set -x -e
44

5+
APP="${1:-stack_wallet}"
6+
57
mkdir -p build
68
. ./config.sh
79

810
PLUGINS_DIR=../../crypto_plugins
911

10-
# libepiccash requires old rust
1112
source ../rust_version.sh
12-
set_rust_version_for_libepiccash
13-
(cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh )
14-
set_rust_version_for_libmwc
15-
(cd "${PLUGINS_DIR}"/flutter_libmwc/scripts/android && ./build_all.sh )
16-
# set rust (back) to a more recent stable release after building epiccash
13+
14+
if [[ "$APP" = "stack_wallet" ]]; then
15+
set_rust_version_for_libepiccash
16+
(cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./build_all.sh )
17+
set_rust_version_for_libmwc
18+
(cd "${PLUGINS_DIR}"/flutter_libmwc/scripts/android && ./build_all.sh )
19+
fi
20+
1721
set_rust_to_everything_else
1822

19-
(cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh )
23+
if [[ "$APP" = "stack_wallet" || "$APP" = "stack_duo" ]]; then
24+
(cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./build_all.sh )
25+
fi
2026

2127
wait
2228
echo "Done building"

‎scripts/android/build_all_campfire.sh‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎scripts/android/build_all_duo.sh‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎scripts/android/download_all.sh‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@
22

33
set -x -e
44

5+
APP="${1:-stack_wallet}"
6+
57
mkdir -p build
68
. ./config.sh
79

810
PLUGINS_DIR=../../crypto_plugins
911

10-
(cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./download.sh)
11-
12-
(cd "${PLUGINS_DIR}"/flutter_libmwc/scripts/android && ./download.sh)
12+
if [[ "$APP" = "stack_wallet" ]]; then
13+
(cd "${PLUGINS_DIR}"/flutter_libepiccash/scripts/android && ./download.sh)
14+
(cd "${PLUGINS_DIR}"/flutter_libmwc/scripts/android && ./download.sh)
15+
fi
1316

14-
(cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./download.sh)
17+
if [[ "$APP" = "stack_wallet" || "$APP" = "stack_duo" ]]; then
18+
(cd "${PLUGINS_DIR}"/frostdart/scripts/android && ./download.sh)
19+
fi
1520

1621
wait
1722
echo "Done"

‎scripts/app_config/configure_stack_duo.sh‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@ NEW_PUBSPEC_NAME="stackduo"
1414
PUBSPEC_FILE="${APP_PROJECT_ROOT_DIR}/pubspec.yaml"
1515

1616
# String replacements.
17-
if [[ "$(uname)" == 'Darwin' ]]; then
18-
# macos specific sed
19-
sed -i '' "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
20-
sed -i '' "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
21-
else
22-
sed -i "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
23-
sed -i "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
24-
fi
17+
sed -i.bak \
18+
-e "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" \
19+
-e "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" \
20+
"${PUBSPEC_FILE}"
21+
rm -f "${PUBSPEC_FILE}.bak"
2522

2623
dart "${APP_PROJECT_ROOT_DIR}/tool/process_pubspec_deps.dart" \
2724
"${PUBSPEC_FILE}" \
@@ -65,7 +62,6 @@ const Set<AppFeature> _features = {
6562
AppFeature.themeSelection,
6663
AppFeature.buy,
6764
AppFeature.tor,
68-
AppFeature.shopinBit,
6965
AppFeature.cakePay,
7066
AppFeature.swap
7167
};

‎scripts/app_config/configure_stack_wallet.sh‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@ NEW_PUBSPEC_NAME="stackwallet"
1414
PUBSPEC_FILE="${APP_PROJECT_ROOT_DIR}/pubspec.yaml"
1515

1616
# String replacements.
17-
if [[ "$(uname)" == 'Darwin' ]]; then
18-
# macos specific sed
19-
sed -i '' "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
20-
sed -i '' "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
21-
else
22-
sed -i "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" "${PUBSPEC_FILE}"
23-
sed -i "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" "${PUBSPEC_FILE}"
24-
fi
17+
sed -i.bak \
18+
-e "s/name: PLACEHOLDER/name: ${NEW_PUBSPEC_NAME}/g" \
19+
-e "s/description: PLACEHOLDER/description: ${NEW_NAME}/g" \
20+
"${PUBSPEC_FILE}"
21+
rm -f "${PUBSPEC_FILE}.bak"
2522

2623
dart "${APP_PROJECT_ROOT_DIR}/tool/process_pubspec_deps.dart" \
2724
"${PUBSPEC_FILE}" \
@@ -93,7 +90,6 @@ const Set<AppFeature> _features = {
9390
AppFeature.themeSelection,
9491
AppFeature.buy,
9592
AppFeature.tor,
96-
AppFeature.shopinBit,
9793
AppFeature.cakePay,
9894
AppFeature.swap
9995
};

0 commit comments

Comments
 (0)