From 2ebe8c3c3e4abacda72186c0b28233b036bd4fab Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Thu, 24 Dec 2015 07:25:46 -0500 Subject: updated crosswalk to a later version Former-commit-id: 4bf81f89eb654f7c1186ede2e7dc7077a27133c9 --- config.xml | 3 ++- ionic.project | 7 ++++--- package.json | 11 ++++++++--- plugins/fetch.json | 16 ++++++++-------- 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 @@ - + + 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 -- cgit v1.2.3