From 39ca1774171f12d9b663d00d9b08caf797956bea Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 10 Jun 2018 10:48:13 -0400 Subject: registered forks to npm, cleaned up build android --- build_android.sh | 15 ++++++--------- config.xml | 18 ++++++++---------- package.json | 30 ++++++++++++++---------------- 3 files changed, 28 insertions(+), 35 deletions(-) diff --git a/build_android.sh b/build_android.sh index 375a2d3d..506ce239 100755 --- a/build_android.sh +++ b/build_android.sh @@ -38,17 +38,17 @@ if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then echo "Removing android and re-adding..." cordova platform remove android cordova platform add android - cordova plugin remove cordova-plugin-crosswalk-webview + cordova plugin remove cordova-plugin-crosswalk-webview --nosave echo "Adding crosswalk..." #cordova plugin add cordova-plugin-crosswalk-webview - cordova plugin add cordova-plugin-crosswalk-webview@2.2.0 --variable XWALK_MODE="lite" --variable "XWALK_VERSION"="17.46.459.1" + cordova plugin add cordova-plugin-crosswalk-webview@2.2.0 --variable XWALK_MODE="lite" --variable "XWALK_VERSION"="17.46.459.1" --nosave #cordova plugin add cordova-plugin-crosswalk-webview --variable XWALK_VERSION="22+" #ionic plugin add cordova-plugin-crosswalk-webview # crosswalk handles SSL certificate handling in a different way # need to switch plugins echo "Adding crosswalk cert plugin..." - cordova plugin remove cordova-plugin-certificates - cordova plugin add https://github.com/danjarvis/cordova-plugin-crosswalk-certificate + cordova plugin remove cordova-plugin-certificates --nosave + cordova plugin add cordova-plugin-crosswalk-certificate-pp-fork --nosave cp "$NINJAKEYSTORE" platforms/android/ echo "Building XWALK ..." #cordova build android --release -- --targetSdkVersion=23 @@ -88,11 +88,8 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then cordova plugin remove cordova-plugin-crosswalk-webview # use the right plugin for SSL certificate mgmt - cordova plugin remove cordova-plugin-crosswalk-certificate - cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin.git - #cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin - #ionic platform remove android - #ionic platform add android + cordova plugin remove cordova-plugin-crosswalk-certificate-pp-fork + cordova plugin add cordova-plugin-cerfificates cp "$NINJAKEYSTORE" platforms/android/ # Make sure native builds are only deployed in devices < Android 5 diff --git a/config.xml b/config.xml index cf41e5c5..58af596b 100644 --- a/config.xml +++ b/config.xml @@ -115,9 +115,6 @@ - - - @@ -127,15 +124,10 @@ - - - - - @@ -143,9 +135,15 @@ - - + + + + + + + + diff --git a/package.json b/package.json index 1a01d50a..f6927321 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,6 @@ "cordova-plugin-globalization": {}, "cordova-plugin-inappbrowser": {}, "cordova-plugin-insomnia": {}, - "cordova-plugin-media": { - "MICROPHONE_USAGE_DESCRIPTION": " " - }, "cordova-plugin-photo-library": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "images to gallery" }, @@ -31,15 +28,10 @@ "cordova-plugin-websocket": {}, "cordova-plugin-whitelist": {}, "cordova-sqlite-storage": {}, - "org.devgeeks.Canvas2ImagePlugin": { - "PHOTOLIBRARY_USAGE_DESCRIPTION": " " - }, "phonegap-plugin-mobile-accessibility": {}, "cordova-custom-config": {}, - "cordova-plugin-email": {}, "cordova-plugin-touch-id": {}, "cordova-plugin-android-fingerprint-auth": {}, - "cordova-plugin-statusbar": {}, "phonegap-plugin-push": { "FCM_VERSION": "11.6.2" }, @@ -47,9 +39,15 @@ "cordova-plugin-device": {}, "cordova-plugin-file": {}, "ionic-plugin-keyboard": {}, - "cordova-library-helper": {}, "cordova.plugins.diagnostic": {}, - "cordova-plugin-certificates": {} + "cordova-plugin-canvas2image-pp-fork": { + "PHOTOLIBRARY_USAGE_DESCRIPTION": " " + }, + "cordova-plugin-media-pp-fork": {}, + "cordova-plugin-email": {}, + "cordova-plugin-statusbar": {}, + "cordova-plugin-certificates": {}, + "cordova-library-helper-pp-fork": {} } }, "dependencies": { @@ -57,34 +55,34 @@ "cordova-android": "^6.3.0", "cordova-custom-config": "~4.0.2", "cordova-ios": "^4.5.4", - "cordova-library-helper": "https://github.com/FlyingDonkeyDev/cordova-library-helper.git", + "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", - "cordova-plugin-certificates": "https://github.com/hypery2k/cordova-certificate-plugin.git", + "cordova-plugin-canvas2image-pp-fork": "^0.6.0", + "cordova-plugin-certificates": "^0.6.4", "cordova-plugin-customurlscheme": "^4.3.0", "cordova-plugin-device": "^2.0.1", - "cordova-plugin-email": "https://github.com/pliablepixels/cordova-email-plugin.git", + "cordova-plugin-email": "^1.2.7", "cordova-plugin-file": "^6.0.1", "cordova-plugin-file-transfer": "^1.7.1", "cordova-plugin-globalization": "^1.0.7", "cordova-plugin-inappbrowser": "^1.7.1", "cordova-plugin-insomnia": "^4.3.0", - "cordova-plugin-media": "https://github.com/pliablepixels/cordova-plugin-media.git", + "cordova-plugin-media-pp-fork": "^1.0.2-dev", "cordova-plugin-network-information": "^2.0.1", "cordova-plugin-photo-library": "^1.2.2", "cordova-plugin-pin-dialog": "^0.1.3", "cordova-plugin-settings-hook": "^0.2.7", "cordova-plugin-splashscreen": "^4.0.3", - "cordova-plugin-statusbar": "https://github.com/apache/cordova-plugin-statusbar.git", + "cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-touch-id": "^3.2.0", "cordova-plugin-websocket": "^0.12.2", "cordova-plugin-whitelist": "^1.3.2", "cordova-sqlite-storage": "^1.5.3", "cordova.plugins.diagnostic": "^3.7.1", "ionic-plugin-keyboard": "^2.2.1", - "org.devgeeks.Canvas2ImagePlugin": "https://github.com/pliablepixels/Canvas2ImagePlugin.git", "phonegap-plugin-mobile-accessibility": "^1.0.5", "phonegap-plugin-push": "~2.1.3" } -- cgit v1.2.3