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 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'build_android.sh') 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 -- cgit v1.2.3