diff options
| -rwxr-xr-x | build_android.sh | 4 | ||||
| -rw-r--r-- | config.xml | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | www/js/DataModel.js | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/build_android.sh b/build_android.sh index 33686916..70d6b4df 100755 --- a/build_android.sh +++ b/build_android.sh @@ -76,6 +76,7 @@ build_release() { # parse arguments # credit: https://stackoverflow.com/a/14203146/1361529 +MODE="release" while [[ $# -gt 0 ]] do key="$1" @@ -101,6 +102,7 @@ APPVER=`cat config.xml | grep "widget " | sed 's/.* version=\"\([^\"]*\)\" xmlns ver_pre5=${APPVER//.} ver=${APPVER//.}9 + echo "About to build version: $APPVER ($MODE)" read -p "Press any key..." @@ -108,6 +110,7 @@ echo "Removing wkwebview, adding certificate fork..." cordova plugin remove cordova-plugin-ionic-webview > /dev/null 2>&1 cordova plugin add cordova-plugin-certificates-pp-fork > /dev/null 2>&1 + if [ "${MODE}" = "debug" ]; then build_debug else @@ -115,6 +118,7 @@ else fi + echo "Adding back wkwebview and removing certificate fork..." cordova plugin remove cordova-plugin-certificates-pp-fork > /dev/null 2>&1 cordova plugin add https://github.com/pliablepixels/cordova-plugin-ionic-webview.git > /dev/null 2>&1 @@ -164,9 +164,9 @@ <plugin name="cordova-plugin-network-information" spec="^2.0.1" /> <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.1" /> <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> + <engine name="android" spec="^6.4.0" /> + <engine name="ios" spec="~4.5.5" /> <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git"> <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" /> </plugin> - <engine name="android" spec="^6.4.0" /> - <engine name="ios" spec="~4.5.5" /> </widget> diff --git a/package.json b/package.json index a893ea48..43bc2ec6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.032", + "version": "1.3.033", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", diff --git a/www/js/DataModel.js b/www/js/DataModel.js index d7bffdb1..3814f21d 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.032"; + var zmAppVersion = "1.3.033"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; |