Skip to content

Commit

Permalink
nits and ver
Browse files Browse the repository at this point in the history
  • Loading branch information
pliablepixels committed Oct 12, 2020
1 parent a110f83 commit 6fd4747
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": {}
}
},
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion www/js/NVR.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6fd4747

Please sign in to comment.