diff options
| -rwxr-xr-x | build_android.sh | 2 | ||||
| -rw-r--r-- | config.xml | 4 | ||||
| -rwxr-xr-x | hooks/before_prepare/01_pp_hacks.sh | 8 | ||||
| -rw-r--r-- | package.json | 10 |
4 files changed, 18 insertions, 6 deletions
diff --git a/build_android.sh b/build_android.sh index c3ea0308..87e8982f 100755 --- a/build_android.sh +++ b/build_android.sh @@ -50,7 +50,7 @@ build_release() { cordova build android --release -- --minSdkVersion=21 --versionCode=${ver} # copy build to release folder and sign - cp platforms/android/build/outputs/apk/release/android-release-unsigned.apk release_files/ + cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk release_files/android-release-unsigned.apk echo "Copied files to release_files" cd release_files/ @@ -164,9 +164,11 @@ <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" /> </plugin> <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> - <plugin name="cordova-plugin-certificates-pp-fork" spec="^0.9.1" /> <plugin name="phonegap-plugin-push" spec="~2.2.3"> <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" /> <variable name="FCM_VERSION" value="11.6.2" /> </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> </widget> diff --git a/hooks/before_prepare/01_pp_hacks.sh b/hooks/before_prepare/01_pp_hacks.sh index 06980e1e..304aca79 100755 --- a/hooks/before_prepare/01_pp_hacks.sh +++ b/hooks/before_prepare/01_pp_hacks.sh @@ -55,6 +55,14 @@ else echo "Directory platforms/android/res/ does not exist, skipping..." fi +echo "Copying Google services to android/app" +echo "--------------------------------------------------" +if [ -d "platforms/android" ]; then + exe cp google-services.json platforms/android/app/ +else + echo "Directory platforms/android doesn't exist" +fi + #echo "Fixing insecure SSL permission problem" #echo "--------------------------------------------------" #if [ -d "platforms/android/CordovaLib/src/org/apache/cordova/engine" ]; then diff --git a/package.json b/package.json index 8bed17a0..b1a34725 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.035", + "version": "1.3.035", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -48,10 +48,12 @@ "ANDROID_SUPPORT_V4_VERSION": "24.1.1+" }, "cordova-plugin-media-pp-fork": {}, - "cordova-plugin-certificates-pp-fork": {}, "phonegap-plugin-push": { "ANDROID_SUPPORT_V13_VERSION": "27.+", "FCM_VERSION": "11.6.2" + }, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" } } }, @@ -64,7 +66,6 @@ "cordova-plugin-android-fingerprint-auth": "^1.5.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", - "cordova-plugin-certificates-pp-fork": "^0.9.1", "cordova-plugin-cloud-settings": "^1.0.4", "cordova-plugin-customurlscheme": "^4.3.0", "cordova-plugin-device": "^2.0.2", @@ -75,6 +76,7 @@ "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", @@ -170,4 +172,4 @@ ] } } -} +}
\ No newline at end of file |