Skip to content

Commit a9993de

Browse files
committed
adjust scripts and readme
1 parent a661af3 commit a9993de

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,14 @@ If you have `bitkit-e2e-tests`, `bitkit-android`, and `bitkit-ios` checked out i
6060
./scripts/build-ios-sim.sh
6161
```
6262

63-
Optional Android override to use network Electrum:
63+
Optional Android backend selection:
6464

6565
```bash
66-
E2E_BACKEND=network ./scripts/build-android-apk.sh
66+
# local Electrum (default)
67+
./scripts/build-android-apk.sh
68+
69+
# regtest Electrum (network)
70+
BACKEND=regtest ./scripts/build-android-apk.sh
6771
```
6872

6973
---

scripts/build-android-apk.sh

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,50 @@
1212
# - Android SDK/NDK as required by the project, Gradle wrapper
1313
#
1414
# Usage:
15-
# E2E_BACKEND=network ./scripts/build-android-apk.sh [API_LEVEL]
15+
# ./scripts/build-android-apk.sh [API_LEVEL]
16+
# BACKEND=regtest ./scripts/build-android-apk.sh [API_LEVEL]
1617
# Example:
1718
# ./scripts/build-android-apk.sh 14
1819
set -euo pipefail
1920

2021
E2E_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
2122
ANDROID_ROOT="$(cd "$E2E_ROOT/../bitkit-android" && pwd)"
2223

23-
E2E_BACKEND="${E2E_BACKEND:-local}"
24+
BACKEND="${BACKEND:-local}"
25+
E2E_BACKEND="local"
26+
GRADLE_TASK="assembleDevDebug"
27+
APK_FLAVOR_DIR="dev"
28+
APK_VARIANT="devDebug"
29+
30+
if [[ "$BACKEND" == "regtest" ]]; then
31+
E2E_BACKEND="network"
32+
elif [[ "$BACKEND" == "local" ]]; then
33+
E2E_BACKEND="local"
34+
else
35+
echo "ERROR: Unsupported BACKEND value: $BACKEND" >&2
36+
exit 1
37+
fi
38+
echo "Building Android APK (BACKEND=$BACKEND, E2E_BACKEND=$E2E_BACKEND)..."
2439

2540
pushd "$ANDROID_ROOT" >/dev/null
26-
E2E=true E2E_BACKEND="$E2E_BACKEND" ./gradlew assembleDevDebug --no-daemon --stacktrace
41+
E2E=true E2E_BACKEND="$E2E_BACKEND" ./gradlew "$GRADLE_TASK" --no-daemon --stacktrace
2742
popd >/dev/null
2843

2944
# Determine APK path: prefer provided API level, else auto-detect, else fallback to 14
3045
API_LEVEL="${1:-}"
31-
APK_DIR="$ANDROID_ROOT/app/build/outputs/apk/dev/debug"
46+
APK_DIR="$ANDROID_ROOT/app/build/outputs/apk/$APK_FLAVOR_DIR/debug"
3247

3348
if [[ -n "$API_LEVEL" ]]; then
34-
APK_PATH="$APK_DIR/bitkit-android-$API_LEVEL-devDebug.apk"
49+
APK_PATH="$APK_DIR/bitkit-android-$API_LEVEL-$APK_VARIANT.apk"
3550
else
3651
# Auto-detect from available artifacts
3752
# shellcheck disable=SC2012
38-
DETECTED_APK="$(ls -t "$APK_DIR"/bitkit-android-*-devDebug.apk 2>/dev/null | head -n 1 || true)"
53+
DETECTED_APK="$(ls -t "$APK_DIR"/bitkit-android-*-"$APK_VARIANT".apk 2>/dev/null | head -n 1 || true)"
3954
if [[ -n "$DETECTED_APK" ]]; then
4055
APK_PATH="$DETECTED_APK"
4156
else
4257
API_LEVEL="14"
43-
APK_PATH="$APK_DIR/bitkit-android-$API_LEVEL-devDebug.apk"
58+
APK_PATH="$APK_DIR/bitkit-android-$API_LEVEL-$APK_VARIANT.apk"
4459
fi
4560
fi
4661

@@ -53,4 +68,3 @@ OUT="$E2E_ROOT/aut"
5368
mkdir -p "$OUT"
5469
cp -f "$APK_PATH" "$OUT/bitkit_e2e.apk"
5570
echo "Android APK copied to: $OUT/bitkit_e2e.apk (from $(basename "$APK_PATH"))"
56-

0 commit comments

Comments
 (0)