commit 4db25ac120658ea68802c7af22b1deea3296a8ae
parent c3f0240e67eee4419fb40b1b5f49e0492b39deba
Author: Iván Ávalos <avalos@disroot.org>
Date: Tue, 5 Dec 2023 14:22:53 -0600
android: bump qtart to 0.9.4-dev.1 and move WALLET_CORE_VERSION to gradle.properties
Diffstat:
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/QuickJS-android/gradle.properties b/QuickJS-android/gradle.properties
@@ -2,7 +2,7 @@ android.useAndroidX=true
GROUP=net.taler
POM_ARTIFACT_ID=qtart
-VERSION_NAME=0.9.3-dev.35
+VERSION_NAME=0.9.4-dev.1
POM_NAME=QuickjsTart
POM_DESCRIPTION=QuickJS runtime for Taler
@@ -20,3 +20,5 @@ POM_SCM_DEV_CONNECTION=scm:git:ssh://git@git.taler.net/quickjs-tart.git
POM_DEVELOPER_ID=avalos
POM_DEVELOPER_NAME=Ivn valos
POM_DEVELOPER_URL=https://avalos.me/
+
+WALLET_CORE_VERSION=v0.9.4-dev.1
diff --git a/docker-android/build.sh b/docker-android/build.sh
@@ -15,6 +15,10 @@ cp $QJS_PATH/*.c ./
cp $QJS_PATH/*.h ./
cp $QJS_PATH/*.js ./
+# Get wallet-core version from gradle.properties
+GRADLE_PROPERTIES_FILE=./QuickJS-android/gradle.properties
+WALLET_CORE_VERSION=$(grep -hoP '^WALLET_CORE_VERSION=\K.*' $GRADLE_PROPERTIES_FILE)
+
# Download and build wallet-core (as non-root)
git clone https://git.taler.net/wallet-core.git
cd wallet-core/
diff --git a/docker-android/env.example b/docker-android/env.example
@@ -6,6 +6,3 @@ ORG_GRADLE_PROJECT_mavenCentralUsername=
ORG_GRADLE_PROJECT_mavenCentralPassword=
ORG_GRADLE_PROJECT_signingInMemoryKey=
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword=
-
-# vX.Y.Z or vX.Y.Z-dev.A
-WALLET_CORE_VERSION=