diff --git a/bin/gen_release_app_zip.sh b/bin/gen_release_app_zip.sh new file mode 100644 index 000000000..abcd193c9 --- /dev/null +++ b/bin/gen_release_app_zip.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +PROJECT=$1 +VERSION=$2 + +pushd platforms/ios/build/emulator +zip -o ../../../../$PROJECT-build-$VERSION.app.zip -r NREL\ OpenPATH.app +popd diff --git a/bin/sign_and_align_keys.sh b/bin/sign_and_align_keys.sh index 3a0bb0d76..261058bd5 100644 --- a/bin/sign_and_align_keys.sh +++ b/bin/sign_and_align_keys.sh @@ -10,7 +10,7 @@ fi # Sign and release the L+ version # Make sure the highest supported version has the biggest version code -npx cordova build android --release -- --minSdkVersion=22 +npm run build-prod-android # cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.aab platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore ../config_files/production.keystore ./platforms/android/app/build/outputs/bundle/release/app-release.aab androidproductionkey cp platforms/android/app/build/outputs/bundle/release/app-release.aab $1-build-$2.aab diff --git a/config.cordovabuild.xml b/config.cordovabuild.xml index 6a0c1480e..d3d562802 100644 --- a/config.cordovabuild.xml +++ b/config.cordovabuild.xml @@ -13,7 +13,6 @@ - @@ -48,8 +47,6 @@ - - diff --git a/package.cordovabuild.json b/package.cordovabuild.json index 72c8304aa..3017715c6 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -11,7 +11,10 @@ "build": "npx webpack --config webpack.prod.js && npx cordova build", "build-dev": "npx webpack --config webpack.dev.js && npx cordova build", "build-dev-android": "npx webpack --config webpack.dev.js && npx cordova build android", - "build-dev-ios": "npx webpack --config webpack.dev.js && npx cordova build ios" + "build-dev-ios": "npx webpack --config webpack.dev.js && npx cordova build ios", + "build-prod-android": "npx webpack --config webpack.prod.js && npx cordova build android", + "build-prod-ios": "npx webpack --config webpack.prod.js && npx cordova build ios", + "build-prod-android-release": "npx webpack --config webpack.prod.js && npx cordova build android --release" }, "devDependencies": { "@babel/core": "^7.21.3", @@ -115,14 +118,14 @@ "chart.js": "^4.3.0", "chartjs-adapter-luxon": "^1.3.1", "chartjs-plugin-annotation": "^3.0.1", - "cordova-android": "11.0.0", + "cordova-android": "12.0.0", "cordova-ios": "6.2.0", "cordova-plugin-advanced-http": "3.3.1", "cordova-plugin-androidx-adapter": "1.1.3", "cordova-plugin-app-version": "0.1.14", "cordova-plugin-customurlscheme": "5.0.2", "cordova-plugin-device": "2.1.0", - "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.8", + "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.9", "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.2", "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.6", "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.2", @@ -130,7 +133,7 @@ "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.6", "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.6", "cordova-plugin-email-composer": "git+https://github.com/katzer/cordova-plugin-email-composer.git#0.10.1", - "cordova-plugin-file": "7.0.0", + "cordova-plugin-file": "8.0.0", "cordova-plugin-inappbrowser": "5.0.0", "cordova-plugin-ionic-keyboard": "2.2.0", "cordova-plugin-ionic-webview": "5.0.0",