ver

ZoneMinder · Jul 2, 2020 · 148d931 · 148d931
1 parent 49b9108
commit 148d931
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 221 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/build_android.sh b/build_android.sh
@@ -71,8 +71,8 @@ build_release() {
             echo "***VERSION CODE CHECKS:"
             for f in release_files/*; do
                 echo "$f:"
-                `echo $ANDROID_HOME`/build-tools/${SDK_VERSION}/aapt dump badging $f | grep versionCode
-                `echo $ANDROID_HOME`/build-tools/${SDK_VERSION}/aapt dump badging $f | grep native-code
+                `echo $ANDROID_SDK_ROOT`/build-tools/${SDK_VERSION}/aapt dump badging $f | grep versionCode
+                `echo $ANDROID_SDK_ROOT`/build-tools/${SDK_VERSION}/aapt dump badging $f | grep native-code
             done
 
   }

diff --git a/checkperms.sh b/checkperms.sh
@@ -6,4 +6,4 @@ else
 	FILE="$1"
 fi
 echo "*** Permissions for $FILE ***"
-`echo $ANDROID_HOME`/build-tools/${SDK_VERSION}/aapt d permissions $FILE
+`echo $ANDROID_SDK_ROOT`/build-tools/${SDK_VERSION}/aapt d permissions $FILE
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.4.008" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.4.009" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -185,9 +185,6 @@
     <plugin name="cordova-plugin-app-version" spec="0.1.9" />
     <plugin name="cordova-plugin-inappbrowser" spec="https://github.com/apache/cordova-plugin-inappbrowser.git" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
-    <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>
     <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
     <engine name="android" spec="^8.0.0" />
     <engine name="ios" spec="^4.5.5" />

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.4.008",
+  "version": "1.4.009",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -62,9 +62,6 @@
       "cordova-plugin-app-version": {},
       "cordova-plugin-statusbar-pp-fork": {},
       "cordova-plugin-statusbar": {},
-      "cordova-plugin-ionic-webview": {
-        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
-      },
       "cordova-plugin-media-pp-fork": {}
     }
   },
@@ -91,7 +88,6 @@
     "cordova-plugin-inappbrowser": "git+https://github.com/apache/cordova-plugin-inappbrowser.git",
     "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
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.4.008";
+      var zmAppVersion = "1.4.009";
 
       var isBackground = false;
       var justResumed = false;