commit f49b32f17086e8dd00131dbbf5396d894e5dce32
parent 36c03feef45d71b9f6f57263c1c65ec62f6cf26a
Author: Iván Ávalos <avalos@disroot.org>
Date: Wed, 25 Jan 2023 20:06:04 -0600
Dockerfile now supports Maven publishing
Diffstat:
6 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ cross/android-*.cross.txt
build-*
builddir
+
+.env
+\ No newline at end of file
diff --git a/QuickJS-android/.idea/vcs.xml b/QuickJS-android/.idea/vcs.xml
@@ -3,6 +3,5 @@
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
- <mapping directory="$PROJECT_DIR$/deps/android-node-v8" vcs="Git" />
</component>
</project>
\ No newline at end of file
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.2
+VERSION_NAME=0.1
POM_NAME=QuickjsTart
POM_DESCRIPTION=QuickJS runtime for Taler
diff --git a/QuickJS-android/qtart/build.gradle.kts b/QuickJS-android/qtart/build.gradle.kts
@@ -31,9 +31,9 @@ dependencies {
androidTestImplementation("androidx.test.ext:junit:1.1.5")
}
-signing {
+/*signing {
useGpgCmd()
-}
+}*/
extensions.getByType<MavenPublishPluginExtension>().apply {
sonatypeHost = SonatypeHost.S01
diff --git a/docker-android/build.sh b/docker-android/build.sh
@@ -10,7 +10,6 @@ set -x
./cross/build-android.sh arm64-v8a
./cross/build-android.sh armeabi-v7a
-# Build .aar library
ANDROID_DIR=./QuickJS-android
JNILIBS_DIR=$ANDROID_DIR/qtart/src/main/jniLibs
cp ./build-android-x86/libtalerwalletcore.so $JNILIBS_DIR/x86
@@ -18,4 +17,10 @@ cp ./build-android-x86_64/libtalerwalletcore.so $JNILIBS_DIR/x86_64
cp ./build-android-arm64-v8a/libtalerwalletcore.so $JNILIBS_DIR/arm64-v8a
cp ./build-android-armeabi-v7a/libtalerwalletcore.so $JNILIBS_DIR/armeabi-v7a
cd $ANDROID_DIR
-./gradlew build
+
+# Build or publish .aar library
+if [ -z "${MAVEN_PUBLISH+x}" ]; then
+ ./gradlew build
+else
+ ./gradlew publishAllPublicationsToMavenCentralRepository
+fi
diff --git a/docker-android/install.sh b/docker-android/install.sh
@@ -8,8 +8,9 @@ apt-get install -y --no-install-recommends \
curl \
default-jdk-headless \
git \
- unzip \
- wget
+ gnupg \
+ unzip \
+ wget
apt-get install -y --no-install-recommends \
meson -t bullseye-backports