update android sdk targets

4 files changed, 7 insertions, 12 deletions

diff --git a/build_android.sh b/build_android.sh
index 9c4e1a53..9692dad5 100755
--- a/build_android.sh
+++ b/build_android.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+SDK_VERSION='29.0.1'
 
 
 build_debug() {
@@ -48,7 +49,7 @@ build_release() {
             cp "$NINJAKEYSTORE" platforms/android/
 
             # Make sure native builds are only deployed in devices >= Android 5
-            cordova build android --release -- --minSdkVersion=21 --versionCode=${ver}
+            cordova build android --release -- --minSdkVersion=28 --versionCode=${ver}
 
             # copy build to release folder and sign
             cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk release_files/android-release-unsigned.apk
@@ -56,7 +57,7 @@ build_release() {
 
             cd release_files/
             jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../platforms/android/zmNinja.keystore android-release-unsigned.apk zmNinja
-            ~/Library/Android/sdk/build-tools/25.0.2/zipalign -v 4 android-release-unsigned.apk zmNinja.apk
+            ~/Library/Android/sdk/build-tools/${SDK_VERSION}/zipalign -v 4 android-release-unsigned.apk zmNinja.apk
             rm -f android-release-unsigned.apk 
             cd ..
 
diff --git a/checkperms.sh b/checkperms.sh
index b5f92c5b..3d2292f9 100755
--- a/checkperms.sh
+++ b/checkperms.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
+SDK_VERSION='29.0.1'
 if [ -z "$1" ]; then
 	FILE="platforms/android/build/outputs/apk/android-debug.apk"
 else
 	FILE="$1"
 fi
 echo "*** Permissions for $FILE ***"
-`echo $ANDROID_HOME`/build-tools/23.0.1/aapt d permissions $FILE
+`echo $ANDROID_HOME`/build-tools/${SDK_VERSION}/aapt d permissions $FILE
diff --git a/config.xml b/config.xml
index 6a353d10..18c32d53 100644
--- a/config.xml
+++ b/config.xml
@@ -172,9 +172,6 @@
     <plugin name="cordova-plugin-photo-library" spec="https://github.com/nilebma/cordova-plugin-photo-library.git">
         <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
     </plugin>
-    <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="7.1.4" />
     <engine name="ios" spec="4.5.5" />
diff --git a/package.json b/package.json
index 86b78d8e..c41d6d92 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version":"1.3.070",
+  "version": "1.3.070",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -56,9 +56,6 @@
       "cordova-plugin-photo-library": {
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums "
       },
-      "cordova-plugin-ionic-webview": {
-        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
-      },
       "cordova-plugin-media-pp-fork": {}
     }
   },
@@ -84,7 +81,6 @@
     "cordova-plugin-inappbrowser": "^1.7.2",
     "cordova-plugin-insomnia": "^4.3.0",
     "cordova-plugin-ionic-keyboard": "^2.1.3",
-    "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.1",
@@ -192,4 +188,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file