summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-12-24 07:25:46 -0500
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-12-24 07:25:46 -0500
commit2ebe8c3c3e4abacda72186c0b28233b036bd4fab (patch)
tree1ccf5e5775430bda72ff99bde01c57f3ac24d816
parent7c05ffe1f5665ca17513343fa5cfb7cb16673f7b (diff)
updated crosswalk to a later version
Former-commit-id: 4bf81f89eb654f7c1186ede2e7dc7077a27133c9
-rw-r--r--config.xml3
-rw-r--r--ionic.project7
-rw-r--r--package.json11
-rw-r--r--plugins/fetch.json16
4 files changed, 22 insertions, 15 deletions
diff --git a/config.xml b/config.xml
index 9759fab1..c9dfe32a 100644
--- a/config.xml
+++ b/config.xml
@@ -73,7 +73,8 @@
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
</platform>
<icon src="resources/android/icon/drawable-xhdpi-icon.png" />
- <preference name="xwalkVersion" value="14+" />
+ <preference name="xwalkVersion" value="15+" />
<preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
<preference name="xwalkMode" value="embedded" />
+ <preference name="xwalkMultipleApk" value="true" />
</widget>
diff --git a/ionic.project b/ionic.project
index 4bc73a69..b1e6799d 100644
--- a/ionic.project
+++ b/ionic.project
@@ -5,13 +5,14 @@
{
"path": "/zm",
"proxyUrl": "",
- "rejectUnauthorized" : false
- }],
+ "rejectUnauthorized": false
+ }
+ ],
"browsers": [
{
"platform": "android",
"browser": "crosswalk",
- "version": "12.41.296.5"
+ "version": "14.42.334.0"
}
],
"gulpStartupTasks": [
diff --git a/package.json b/package.json
index a7c7c92b..cdae17b5 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
"locator": "https://github.com/leecrossley/cordova-plugin-touchid.git",
"id": "cordova-plugin-touchid"
},
- "cordova-plugin-crosswalk-webview",
"cordova-plugin-ios-longpress-fix",
"cordova-plugin-websocket",
{
@@ -73,15 +72,21 @@
{
"locator": "https://github.com/pliablepixels/cordova-plugin-media.git",
"id": "org.apache.cordova.media"
- }
+ },
+ "cordova-plugin-crosswalk-webview"
],
"cordovaPlatforms": [
"ios",
- "android",
{
"platform": "ios",
"version": "",
"locator": "ios"
+ },
+ "android",
+ {
+ "platform": "android",
+ "version": "",
+ "locator": "android"
}
]
}
diff --git a/plugins/fetch.json b/plugins/fetch.json
index 532c8ada..421ac12e 100644
--- a/plugins/fetch.json
+++ b/plugins/fetch.json
@@ -131,14 +131,6 @@
"is_top_level": true,
"variables": {}
},
- "cordova-plugin-crosswalk-webview": {
- "source": {
- "type": "registry",
- "id": "cordova-plugin-crosswalk-webview"
- },
- "is_top_level": true,
- "variables": {}
- },
"cordova-plugin-ios-longpress-fix": {
"source": {
"type": "registry",
@@ -214,5 +206,13 @@
},
"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