summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-06-10 10:48:13 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-06-10 10:48:13 -0400
commit39ca1774171f12d9b663d00d9b08caf797956bea (patch)
tree023eb7fa0955cedfaeba1bf896e633784dd760ae
parent4321fbd166e8857209347817b98ce705cc345385 (diff)
registered forks to npm, cleaned up build android
-rwxr-xr-xbuild_android.sh15
-rw-r--r--config.xml18
-rw-r--r--package.json30
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 @@
<plugin name="cordova-plugin-globalization" spec="^1.0.7" />
<plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
<plugin name="cordova-plugin-insomnia" spec="^4.3.0" />
- <plugin name="cordova-plugin-media" spec="https://github.com/pliablepixels/cordova-plugin-media.git">
- <variable name="MICROPHONE_USAGE_DESCRIPTION" value=" " />
- </plugin>
<plugin name="cordova-plugin-photo-library" spec="^1.2.2">
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="images to gallery" />
</plugin>
@@ -127,15 +124,10 @@
<plugin name="cordova-plugin-websocket" spec="^0.12.2" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
<plugin name="cordova-sqlite-storage" spec="^1.5.3" />
- <plugin name="org.devgeeks.Canvas2ImagePlugin" spec="https://github.com/pliablepixels/Canvas2ImagePlugin.git">
- <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value=" " />
- </plugin>
<plugin name="phonegap-plugin-mobile-accessibility" spec="^1.0.5" />
<plugin name="cordova-custom-config" spec="~4.0.2" />
- <plugin name="cordova-plugin-email" spec="https://github.com/pliablepixels/cordova-email-plugin.git" />
<plugin name="cordova-plugin-touch-id" spec="^3.2.0" />
<plugin name="cordova-plugin-android-fingerprint-auth" spec="^1.4.0" />
- <plugin name="cordova-plugin-statusbar" spec="https://github.com/apache/cordova-plugin-statusbar.git" />
<plugin name="phonegap-plugin-push" spec="~2.1.3">
<variable name="FCM_VERSION" value="11.6.2" />
</plugin>
@@ -143,9 +135,15 @@
<plugin name="cordova-plugin-device" spec="^2.0.1" />
<plugin name="cordova-plugin-file" spec="^6.0.1" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
- <plugin name="cordova-library-helper" spec="https://github.com/FlyingDonkeyDev/cordova-library-helper.git" />
<plugin name="cordova.plugins.diagnostic" spec="^3.7.1" />
- <plugin name="cordova-plugin-certificates" spec="https://github.com/hypery2k/cordova-certificate-plugin.git" />
<engine name="ios" spec="^4.5.4" />
<engine name="android" spec="^6.3.0" />
+ <plugin name="cordova-plugin-canvas2image-pp-fork" spec="^0.6.0">
+ <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value=" " />
+ </plugin>
+ <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+ <plugin name="cordova-plugin-email" spec="^1.2.7" />
+ <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
+ <plugin name="cordova-plugin-certificates" spec="^0.6.4" />
+ <plugin name="cordova-library-helper-pp-fork" spec="^1.0.1" />
</widget>
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"
}