quickjs-tart

commit 794ad5ba9448c5d42682bea051570af54efd71eb
parent cd1ecb177a2df4ca4c9a1476ad5a2a4c54ca7747
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 28 Jun 2023 22:24:09 -0600

Copy files to Docker container on run step

Diffstat:
M
QuickJS-android/.idea/compiler.xml
 | 
2
+-
M
QuickJS-android/.idea/misc.xml
 | 
2
+-
M
QuickJS-android/gradle.properties
 | 
2
+-
M
docker-android/Dockerfile
 | 
9
---------
M
docker-android/build.sh
 | 
12
++++++++++++
M
docker-android/docker-compose.yml
 | 
2
++

6 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/QuickJS-android/.idea/compiler.xml b/QuickJS-android/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
 \ No newline at end of file
diff --git a/QuickJS-android/.idea/misc.xml b/QuickJS-android/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
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.8
+VERSION_NAME=0.9.3-dev.11
 
 POM_NAME=QuickjsTart
 POM_DESCRIPTION=QuickJS runtime for Taler
diff --git a/docker-android/Dockerfile b/docker-android/Dockerfile
@@ -18,14 +18,5 @@ RUN apt-get -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ADD ./docker-android/build.sh ./
-ADD ./download_wallet_core_js.sh ./
-ADD ./quickjs ./quickjs
-ADD ./subprojects ./subprojects
-ADD ./QuickJS-android ./QuickJS-android
-ADD ./meson.build ./
-ADD ./cross/build-android.sh ./cross/
-ADD ./*.c ./
-ADD ./*.h ./
-ADD ./*.js ./
 
 CMD ./build.sh
diff --git a/docker-android/build.sh b/docker-android/build.sh
@@ -2,6 +2,18 @@
 set -e
 set -x
 
+# Copy all the required files from volume
+QJS_PATH=/opt/quickjs-tart
+cp $QJS_PATH/docker-android/build.sh ./
+cp -r $QJS_PATH/quickjs ./
+cp -r $QJS_PATH/subprojects ./
+cp -r $QJS_PATH/QuickJS-android ./
+cp $QJS_PATH/meson.build ./
+mkdir ./cross && cp $QJS_PATH/cross/build-android.sh ./cross/
+cp $QJS_PATH/*.c ./
+cp $QJS_PATH/*.h ./
+cp $QJS_PATH/*.js ./
+
 # 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/docker-compose.yml b/docker-android/docker-compose.yml
@@ -9,3 +9,5 @@ services:
     volumes:
       - ../.m2:/root/.m2
       - ../.gradle-cache:/root/gradle-cache
+      - ../:/opt/quickjs-tart:ro
+