diff options
| -rwxr-xr-x | build_android.sh | 6 | ||||
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | www/js/NVR.js | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/build_android.sh b/build_android.sh index c06b1d45..2f645912 100755 --- a/build_android.sh +++ b/build_android.sh @@ -25,7 +25,7 @@ build_release() { fi if [[ -z "${ANDROID_SDK_ROOT}" ]]; then - echo "ANDROID_SDK_ROOT must be set for release build" + echo "ANDROID_SDK_ROOT must be set for the build process" exit 1 fi @@ -64,9 +64,9 @@ build_release() { cd release_files/ jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../platforms/android/zmNinja.keystore android-release-unsigned.apk zmNinja - ret=$? + ret=$? if [ $ret -ne 0 ]; then - echo "Unable to sign jar, please fix the error above" + echo "Unable to sign jar, please fix the error(s) above" exit 1 fi diff --git a/package.json b/package.json index 0ea65508..10dacf01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.5.000", + "version": "1.6.000", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -70,9 +70,6 @@ "ANDROID_GSON_VERSION": "2.8.6" }, "cordova-plugin-advanced-http": {}, - "cordova-plugin-ionic-webview": { - "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - }, "cordova-plugin-media-pp-fork": {} } }, @@ -100,7 +97,6 @@ "cordova-plugin-ignore-lint-translation": "0.0.1", "cordova-plugin-insomnia": "^4.3.0", "cordova-plugin-ionic-keyboard": "^2.2.0", - "cordova-plugin-ionic-webview": "git+https://github.com/pliablepixels/cordova-plugin-ionic-webview.git", "cordova-plugin-media-pp-fork": "^1.0.2-dev", "cordova-plugin-multi-window": "0.0.3", "cordova-plugin-network-information": "^2.0.2", diff --git a/www/js/NVR.js b/www/js/NVR.js index e695649d..39156185 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.5.000"; + var zmAppVersion = "1.6.000"; var isBackground = false; var justResumed = false; |