From da302b026fe731c301bf9437cbfcb17fbccaff80 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Thu, 16 Jun 2016 13:44:34 -0400 Subject: packaging changes for android to account for different cert plugins Former-commit-id: 02f29d25b82dc5dc9b9c739fd4e367c1a5462844 --- build_android.sh | 14 +++++ config.xml | 160 ++++++++++++++++++++++++++--------------------------- package.json | 7 +-- plugins/fetch.json | 12 +--- 4 files changed, 97 insertions(+), 96 deletions(-) diff --git a/build_android.sh b/build_android.sh index 2d4407d2..06f1f1e9 100755 --- a/build_android.sh +++ b/build_android.sh @@ -28,7 +28,15 @@ if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then echo "--------------------------------------------" echo "Adding crosswalk..." ionic plugin add cordova-plugin-crosswalk-webview + + + echo "Adding crosswalk cert plugin..." + cordova plugin remove cordova-plugin-certificates + cordova plugin add https://github.com/danjarvis/cordova-plugin-crosswalk-certificate + ionic platform remove android + ionic platform add android cp "$NINJAKEYSTORE" platforms/android + ionic build android --release cp platforms/android/build/outputs/apk/android-x86-release-unsigned.apk release_files/ @@ -57,7 +65,13 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then rm -fr platforms/android/build/outputs/* echo "Adding default browser..." ionic plugin remove cordova-plugin-crosswalk-webview + + cordova plugin remove cordova-plugin-crosswalk-certificate + cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin + ionic platform remove android + ionic platform add android cp "$NINJAKEYSTORE" platforms/android + ionic build android --release -- --minSdkVersion=21 cp platforms/android/build/outputs/apk/android-release-unsigned.apk release_files/ diff --git a/config.xml b/config.xml index 6b7bfcec..981cd630 100644 --- a/config.xml +++ b/config.xml @@ -1,86 +1,82 @@ - - - zmNinja - + + + zmNinja + High performance ZoneMinder client - + Pliable Pixels - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index c15b3a69..fe90cbe5 100644 --- a/package.json +++ b/package.json @@ -66,10 +66,9 @@ "id": "org.apache.cordova.media" }, { - "locator": "https://github.com/danjarvis/cordova-plugin-crosswalk-certificate", - "id": "cordova-plugin-crosswalk-certificate" - }, - "cordova-plugin-crosswalk-webview" + "locator": "https://github.com/hypery2k/cordova-certificate-plugin", + "id": "cordova-plugin-certificates" + } ], "cordovaPlatforms": [ {}, diff --git a/plugins/fetch.json b/plugins/fetch.json index 6e851524..baf9ae3c 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -160,21 +160,13 @@ "is_top_level": true, "variables": {} }, - "cordova-plugin-crosswalk-certificate": { + "cordova-plugin-certificates": { "source": { "type": "git", - "url": "https://github.com/danjarvis/cordova-plugin-crosswalk-certificate", + "url": "https://github.com/hypery2k/cordova-certificate-plugin", "subdir": "." }, "is_top_level": true, "variables": {} - }, - "cordova-plugin-crosswalk-webview": { - "source": { - "type": "registry", - "id": "cordova-plugin-crosswalk-webview" - }, - "is_top_level": true, - "variables": {} } } \ No newline at end of file -- cgit v1.2.3