From cb0ec0fc12a8953c00c4db3e6aca8acb65ec1abc Mon Sep 17 00:00:00 2001
From: "jason.wall" <jason@walljm.com>
Date: Fri, 25 Aug 2017 16:46:07 -0400
Subject: [PATCH] this works... xwalk version 23

---
 DynamicBibleIonic/config.xml                  |  2 +-
 DynamicBibleIonic/package.json                | 16 ++---
 .../platforms/android/android.json            | 62 +++++++++----------
 .../android/platform_www/cordova_plugins.js   |  4 +-
 .../platforms/android/res/xml/config.xml      |  2 +-
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/DynamicBibleIonic/config.xml b/DynamicBibleIonic/config.xml
index eda30b1f..a9293a10 100644
--- a/DynamicBibleIonic/config.xml
+++ b/DynamicBibleIonic/config.xml
@@ -69,7 +69,7 @@
     <engine name="android" spec="^6.2.3" />
     <plugin name="cordova-plugin-console" spec="^1.0.5" />
     <plugin name="cordova-plugin-crosswalk-webview" spec="^2.3.0">
-        <variable name="XWALK_VERSION" value="22+" />
+        <variable name="XWALK_VERSION" value="23+" />
         <variable name="XWALK_LITEVERSION" value="xwalk_core_library_canary:17+" />
         <variable name="XWALK_COMMANDLINE" value="--disable-pull-to-refresh-effect" />
         <variable name="XWALK_MODE" value="embedded" />
diff --git a/DynamicBibleIonic/package.json b/DynamicBibleIonic/package.json
index 7062525a..047f1a40 100644
--- a/DynamicBibleIonic/package.json
+++ b/DynamicBibleIonic/package.json
@@ -87,19 +87,19 @@
     },
     "cordova": {
         "plugins": {
-            "cordova-plugin-crosswalk-webview": {
-                "XWALK_VERSION": "22+",
-                "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
-                "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
-                "XWALK_MODE": "embedded",
-                "XWALK_MULTIPLEAPK": "true"
-            },
             "cordova-plugin-console": {},
             "cordova-plugin-device": {},
             "cordova-plugin-splashscreen": {},
             "cordova-plugin-statusbar": {},
             "cordova-plugin-whitelist": {},
-            "ionic-plugin-keyboard": {}
+            "ionic-plugin-keyboard": {},
+            "cordova-plugin-crosswalk-webview": {
+                "XWALK_VERSION": "23+",
+                "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
+                "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
+                "XWALK_MODE": "embedded",
+                "XWALK_MULTIPLEAPK": "true"
+            }
         },
         "platforms": [
             "android"
diff --git a/DynamicBibleIonic/platforms/android/android.json b/DynamicBibleIonic/platforms/android/android.json
index 7a60766c..bf29e811 100644
--- a/DynamicBibleIonic/platforms/android/android.json
+++ b/DynamicBibleIonic/platforms/android/android.json
@@ -8,12 +8,32 @@
             "res/xml/config.xml": {
                 "parents": {
                     "/*": [
+                        {
+                            "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<feature name=\"StatusBar\"><param name=\"android-package\" value=\"org.apache.cordova.statusbar.StatusBar\" /><param name=\"onload\" value=\"true\" /></feature>",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<feature name=\"Keyboard\"><param name=\"android-package\" value=\"io.ionic.keyboard.IonicKeyboard\" /><param name=\"onload\" value=\"true\" /></feature>",
+                            "count": 1
+                        },
                         {
                             "xml": "<preference name=\"webView\" value=\"org.crosswalk.engine.XWalkWebViewEngine\" />",
                             "count": 1
                         },
                         {
-                            "xml": "<preference name=\"xwalkVersion\" value=\"22+\" />",
+                            "xml": "<preference name=\"xwalkVersion\" value=\"23+\" />",
                             "count": 1
                         },
                         {
@@ -35,26 +55,6 @@
                         {
                             "xml": "<preference name=\"android-minSdkVersion\" value=\"16\" />",
                             "count": 1
-                        },
-                        {
-                            "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<feature name=\"StatusBar\"><param name=\"android-package\" value=\"org.apache.cordova.statusbar.StatusBar\" /><param name=\"onload\" value=\"true\" /></feature>",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
-                            "count": 1
-                        },
-                        {
-                            "xml": "<feature name=\"Keyboard\"><param name=\"android-package\" value=\"io.ionic.keyboard.IonicKeyboard\" /><param name=\"onload\" value=\"true\" /></feature>",
-                            "count": 1
                         }
                     ]
                 }
@@ -79,14 +79,6 @@
         "cordova-plugin-console": {
             "PACKAGE_NAME": "walljm.dynamicbible"
         },
-        "cordova-plugin-crosswalk-webview": {
-            "XWALK_VERSION": "22+",
-            "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
-            "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
-            "XWALK_MODE": "embedded",
-            "XWALK_MULTIPLEAPK": "true",
-            "PACKAGE_NAME": "walljm.dynamicbible"
-        },
         "cordova-plugin-device": {
             "PACKAGE_NAME": "walljm.dynamicbible"
         },
@@ -101,6 +93,14 @@
         },
         "ionic-plugin-keyboard": {
             "PACKAGE_NAME": "walljm.dynamicbible"
+        },
+        "cordova-plugin-crosswalk-webview": {
+            "XWALK_VERSION": "23+",
+            "XWALK_LITEVERSION": "xwalk_core_library_canary:17+",
+            "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect",
+            "XWALK_MODE": "embedded",
+            "XWALK_MULTIPLEAPK": "true",
+            "PACKAGE_NAME": "walljm.dynamicbible"
         }
     },
     "dependent_plugins": {},
@@ -141,11 +141,11 @@
     ],
     "plugin_metadata": {
         "cordova-plugin-console": "1.0.5",
-        "cordova-plugin-crosswalk-webview": "2.3.0",
         "cordova-plugin-device": "1.1.4",
         "cordova-plugin-splashscreen": "4.0.3",
         "cordova-plugin-statusbar": "2.2.3",
         "cordova-plugin-whitelist": "1.3.1",
-        "ionic-plugin-keyboard": "2.2.1"
+        "ionic-plugin-keyboard": "2.2.1",
+        "cordova-plugin-crosswalk-webview": "2.3.0"
     }
 }
\ No newline at end of file
diff --git a/DynamicBibleIonic/platforms/android/platform_www/cordova_plugins.js b/DynamicBibleIonic/platforms/android/platform_www/cordova_plugins.js
index eac51016..f0533e6e 100644
--- a/DynamicBibleIonic/platforms/android/platform_www/cordova_plugins.js
+++ b/DynamicBibleIonic/platforms/android/platform_www/cordova_plugins.js
@@ -38,12 +38,12 @@ module.exports.metadata =
 // TOP OF METADATA
 {
     "cordova-plugin-console": "1.0.5",
-    "cordova-plugin-crosswalk-webview": "2.3.0",
     "cordova-plugin-device": "1.1.4",
     "cordova-plugin-splashscreen": "4.0.3",
     "cordova-plugin-statusbar": "2.2.3",
     "cordova-plugin-whitelist": "1.3.1",
-    "ionic-plugin-keyboard": "2.2.1"
+    "ionic-plugin-keyboard": "2.2.1",
+    "cordova-plugin-crosswalk-webview": "2.3.0"
 };
 // BOTTOM OF METADATA
 });
\ No newline at end of file
diff --git a/DynamicBibleIonic/platforms/android/res/xml/config.xml b/DynamicBibleIonic/platforms/android/res/xml/config.xml
index b0539332..ced2b9db 100644
--- a/DynamicBibleIonic/platforms/android/res/xml/config.xml
+++ b/DynamicBibleIonic/platforms/android/res/xml/config.xml
@@ -69,7 +69,7 @@
     <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
     <preference name="loglevel" value="DEBUG" />
     <preference name="webView" value="org.crosswalk.engine.XWalkWebViewEngine" />
-    <preference name="xwalkVersion" value="22+" />
+    <preference name="xwalkVersion" value="23+" />
     <preference name="xwalkLiteVersion" value="xwalk_core_library_canary:17+" />
     <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
     <preference name="xwalkMode" value="embedded" />