@saltcorn/mobile-builder 1.1.0-beta.11 → 1.1.0-beta.12

package/docker/Dockerfile

@@ -18,40 +18,36 @@ RUN android_sdk/cmdline-tools/13.0/bin/sdkmanager "build-tools;34.0.0"
 RUN wget -q https://services.gradle.org/distributions/gradle-8.4-all.zip \
     && unzip gradle-8.4-all.zip -d /opt
 
-RUN npm install -g cordova@12.0.0
-
 # create an empty project, the first init seems to take longer
 WORKDIR /init_project
-RUN cordova create project
-WORKDIR /init_project/project
-# download plugins while building
-# so that we can add them later via file reference
-RUN cordova plugin add cordova-sqlite-ext@6.0.0
-RUN cordova plugin add cordova-plugin-file@8.1.0
-RUN cordova plugin add cordova-plugin-inappbrowser@6.0.0
-RUN cordova plugin add cordova-plugin-network-information@3.0.0
-RUN cordova plugin add cordova-plugin-geolocation@5.0.0
-RUN cordova plugin add cordova-plugin-camera@7.0.0
-RUN cordova platform add android@^13.0.0
+RUN npm init -y
+RUN mkdir www
+RUN touch www/index.html
+RUN npm install @capacitor/cli @capacitor/core @capacitor/android
+RUN npx cap init MyApp com.example.myapp --web-dir www
+RUN npx cap add android
+RUN npx cap sync
+
 ENV ANDROID_SDK_ROOT=/android_sdk
 ENV ANDROID_HOME=/android_sdk
 ENV GRADLE_HOME=/opt/gradle-8.4
 ENV PATH=$PATH:/opt/gradle-8.4/bin
-# stop gradle from downloading itself
-ENV CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-8.4-all.zip
-RUN cordova build android
 
-# due to a bug in npm that has been addressed since then
-# some files in '/root/.npm' are owned by root
-RUN chown -R 1000:1000 "/root/.npm"
-RUN chmod -R o+rwx "/root/.npm"
+RUN cat <<EOF > /init_project/android/gradle/wrapper/gradle-wrapper.properties
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=file\:/gradle-8.4-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+EOF
+
+WORKDIR /init_project/android
+RUN ./gradlew assembleDebug
 
-# prepare entry point
 WORKDIR /
 COPY entry.bash ./
 RUN chmod u+x entry.bash
 
-RUN chmod o+rwx ~
-RUN chmod -R o+rwx ~/.config
-
 ENTRYPOINT ["./entry.bash"]

package/docker/entry.bash

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 BUILD_TYPE="$1"
 KEYSTORE_FILE="$2"
 KEYSTORE_ALIAS="$3"
@@ -15,38 +17,76 @@ export ANDROID_SDK_ROOT=/android_sdk
 export ANDROID_HOME=/android_sdk
 export GRADLE_HOME=/opt/gradle-8.4
 export PATH=$PATH:/opt/gradle-8.4/bin
-# stop gradle from downloading itself
-export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-8.4-all.zip
 
 cd /saltcorn-mobile-app
-echo "adding android platform"
-cordova platform add android
-echo "writing gradle.properties"
-cat <<EOF > /saltcorn-mobile-app/platforms/android/gradle.properties
-org.gradle.jvmargs=-Xmx2048m
-android.useAndroidX=true
-android.enableJetifier=true
+npm install @capacitor/cli @capacitor/core @capacitor/android
+npx cap add android
+npx capacitor-assets generate
+npx cap sync
+
+npm install cordova-plugin-file@8.1.2
+npm install cordova-plugin-inappbrowser@6.0.0
+
+# data extraction rules
+cat <<EOF > /saltcorn-mobile-app/android/app/src/main/res/xml/data_extraction_rules.xml
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+      <exclude domain="root" />
+      <exclude domain="database" />
+      <exclude domain="sharedpref" />
+      <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+      <exclude domain="root" />
+      <exclude domain="database" />
+      <exclude domain="sharedpref" />
+      <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>
+EOF
+
+# network security config
+cat <<EOF > /saltcorn-mobile-app/android/app/src/main/res/xml/network_security_config.xml
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+  <domain-config cleartextTrafficPermitted="true">
+    <domain includeSubdomains="true">10.0.2.2</domain>
+  </domain-config>
+</network-security-config>
+EOF
+
+npm run modify-android-manifest
+npx cap sync
+
+# gradle wrapper
+cat <<EOF > /saltcorn-mobile-app/android/gradle/wrapper/gradle-wrapper.properties
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
 distributionUrl=file\:/gradle-8.4-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
 EOF
 
-echo "adding plugins"
-cordova plugin add /init_project/project/plugins/cordova-plugin-inappbrowser
-cordova plugin add /init_project/project/plugins/cordova-plugin-file
-cordova plugin add /init_project/project/plugins/cordova-sqlite-ext
-cordova plugin add /init_project/project/plugins/cordova-plugin-network-information
-cordova plugin add /init_project/project/plugins/cordova-plugin-geolocation
-cordova plugin add /init_project/project/plugins/cordova-plugin-camera
+npm run build
+npx cap sync
 
-echo "calling cordova build"
-cordova build android --verbose
+# copy prepopulated db
+mkdir -p /saltcorn-mobile-app/android/app/src/main/assets/public/assets/databases
+cp /saltcorn-mobile-app/www/scdb.sqlite /saltcorn-mobile-app/android/app/src/main/assets/public/assets/databases/prepopulated.db
 
+cd ./android
 
+# modify gradle config for keystore
 if [ -n "$KEYSTORE_FILE" ]; then
   echo "building signed app with keystore"
-  cordova build android --"$BUILD_TYPE" --verbose -- --keystore="$KEYSTORE_FILE" --alias="$KEYSTORE_ALIAS" --storePassword="$KEYSTORE_PASSWORD" --password="$KEYSTORE_PASSWORD"
-else
-  echo "building unsigned app"
-  cordova build android --"$BUILD_TYPE" --verbose
+  npm run modify-gradle-cfg -- --keystore-file=$KEYSTORE_FILE --keystore-alias=$KEYSTORE_ALIAS --keystore-password=$KEYSTORE_PASSWORD  
 fi
 
-chmod -R o+rwx /saltcorn-mobile-app
+if [ "$BUILD_TYPE" == "release" ]; then
+  ./gradlew assembleRelease
+else
+  ./gradlew assembleDebug
+fi

package/package.json

@@ -3,20 +3,20 @@
   "description": "plugin to to build a mobile app from a tenant application",
   "homepage": "https://saltcorn.com",
   "repository": "github:saltcorn/saltcorn",
-  "version": "1.1.0-beta.11",
+  "version": "1.1.0-beta.12",
   "author": "Christian Hugo",
   "scripts": {
     "test": "jest ./tests/ --runInBand",
     "build": "webpack --mode development"
   },
   "dependencies": {
-    "@saltcorn/markup": "1.1.0-beta.11",
-    "@saltcorn/data": "1.1.0-beta.11",
-    "@saltcorn/db-common": "1.1.0-beta.11",
-    "@saltcorn/server": "1.1.0-beta.11",
-    "@saltcorn/base-plugin": "1.1.0-beta.11",
-    "@saltcorn/sbadmin2": "1.1.0-beta.11",
-    "@saltcorn/mobile-app": "1.1.0-beta.11",
+    "@saltcorn/markup": "1.1.0-beta.12",
+    "@saltcorn/data": "1.1.0-beta.12",
+    "@saltcorn/db-common": "1.1.0-beta.12",
+    "@saltcorn/server": "1.1.0-beta.12",
+    "@saltcorn/base-plugin": "1.1.0-beta.12",
+    "@saltcorn/sbadmin2": "1.1.0-beta.12",
+    "@saltcorn/mobile-app": "1.1.0-beta.12",
     "fs-extra": "^10.0.1",
     "live-plugin-manager": "^0.17.1",
     "resize-with-sharp-or-jimp": "0.1.8",