diff options
| -rwxr-xr-x | build_android.sh | 4 | ||||
| -rw-r--r-- | config.xml | 10 | ||||
| -rw-r--r-- | package.json | 9 | ||||
| -rw-r--r-- | www/js/NVR.js | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/build_android.sh b/build_android.sh index 2f645912..7882dfee 100755 --- a/build_android.sh +++ b/build_android.sh @@ -1,5 +1,5 @@ #!/bin/bash -SDK_VERSION='29.0.3' +SDK_VERSION='30.0.2' build_debug() { @@ -56,7 +56,7 @@ build_release() { # Make sure native builds are only deployed in devices >= Android 5 # minSdk and targetSdk version are in config.xml - cordova build android --release -- --versionCode=${ver} + cordova build android --release -- --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 @@ -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.6.003" 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.6.004" 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 @@ -36,7 +36,8 @@ <preference name="FadeSplashScreen" value="false" /> <preference name="BackgroundColor" value="#444444" /> <preference name="android-targetSdkVersion" value="29" /> - <preference name="android-minSdkVersion" value="21" /> + <preference name="android-compileSdkVersion" value="29" /> + <preference name="android-minSdkVersion" value="22" /> <preference name="SplashScreenBackgroundColor" value="#ababab" /> <feature name="StatusBar"> <param name="ios-package" onload="true" value="CDVStatusBar" /> @@ -122,8 +123,9 @@ <config-file parent="/*" target="AndroidManifest.xml"> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> </config-file> - <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application"> + <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android"> <application android:usesCleartextTraffic="true" /> + <application android:requestLegacyExternalStorage="true" /> </edit-config> <resource-file src="build-extras.gradle" target="build-extras.gradle" /> <resource-file src="etc/android-notification-icons/ic_stat_notification.png" target="app/src/main/res/drawable/ic_stat_notification.png" /> @@ -170,7 +172,7 @@ <plugin name="cordova-library-helper-pp-fork" spec="^1.0.1" /> <plugin name="cordova-plugin-multi-window" spec="0.0.3" /> <plugin name="cordova-plugin-ignore-lint-translation" spec="0.0.1" /> - <plugin name="cordova-plugin-cloud-settings" spec="^1.0.4"> + <plugin name= "cordova-plugin-cloud-settings" spec="^1.0.4"> <variable name="ANDROID_BACKUP_SERVICE_KEY" value="AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw" /> </plugin> <plugin name="cordova-custom-config" spec="5.0.2" /> diff --git a/package.json b/package.json index 7383cbd9..c1e66968 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.6.003", + "version": "1.6.004", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -70,7 +70,6 @@ "ANDROID_GSON_VERSION": "2.8.6" }, "cordova-plugin-advanced-http": {}, - "cordova-plugin-ionic-webview": {}, "cordova-plugin-media-pp-fork": {}, "cordova-plugin-inappbrowser": {} } @@ -78,7 +77,7 @@ "dependencies": { "async": "^3.2.0", "clivas": "^0.2.0", - "cordova-android": "^8.1.0", + "cordova-android": "^9.0.0", "cordova-custom-config": "^5.1.0", "cordova-ios": "^5.1.1", "cordova-library-helper-pp-fork": "^1.0.1", @@ -100,7 +99,6 @@ "cordova-plugin-inappbrowser": "^4.0.0", "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", @@ -238,10 +236,9 @@ "ia32", "armv7l", "arm64" - ] } ] } } -} +}
\ No newline at end of file diff --git a/www/js/NVR.js b/www/js/NVR.js index f1ecb3ef..54aafc13 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.6.003"; + var zmAppVersion = "1.6.004"; var isBackground = false; var justResumed = false; |