From e2e005ffbb0494bebfaac3b2a9da43ad67c45cb1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 8 Aug 2018 14:08:16 +0200
Subject: [PATCH 1/3] MOBILE-2547 config: Match phonegap build plugin versions

---
 config.xml   | 46 +++++++++++++++++++++++-----------------------
 package.json |  8 ++++----
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/config.xml b/config.xml
index 5b23ca552..c35b402e7 100644
--- a/config.xml
+++ b/config.xml
@@ -91,39 +91,39 @@
         <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
         <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
     </platform>
-    <plugin name="cordova-plugin-file" spec="4.3.3" />
-    <plugin name="cordova-plugin-file-transfer" spec="1.6.3" />
-    <plugin name="cordova-plugin-camera" spec="2.4.1">
+    <plugin name="cordova-plugin-file" spec="^6.0.1" />
+    <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
+    <plugin name="cordova-plugin-camera" spec="^4.0.3">
         <variable name="CAMERA_USAGE_DESCRIPTION" value="We'd like to access your camera to let you take a photo" />
         <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="We'd like like to open your photo library to let you pick a photo" />
     </plugin>
-    <plugin name="cordova-plugin-media-capture" spec="1.4.3">
+    <plugin name="cordova-plugin-media-capture" spec="^3.0.2">
         <variable name="CAMERA_USAGE_DESCRIPTION" value="We'd like to access your camera to let you take a photo" />
         <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="We'd like like to open your photo library to let you pick a photo" />
         <variable name="MICROPHONE_USAGE_DESCRIPTION" value="We'd like to access your microphone to let you record an audio" />
     </plugin>
-    <plugin name="cordova-plugin-device" spec="1.1.6" />
-    <plugin name="cordova-plugin-globalization" spec="1.0.7" />
+    <plugin name="cordova-plugin-device" spec="^2.0.2" />
+    <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
     <plugin name="cordova-plugin-inappbrowser" spec="^3.0.0" />
-    <plugin name="cordova-plugin-network-information" spec="1.3.3" />
-    <plugin name="cordova-plugin-statusbar" spec="2.2.3" />
-    <plugin name="cordova-plugin-whitelist" spec="1.3.2" />
-    <plugin name="cordova-plugin-splashscreen" spec="4.0.3" />
-    <plugin name="cordova-clipboard" spec="1.1.0" />
-    <plugin name="nl.kingsquare.cordova.background-audio" spec="1.0.1" />
-    <plugin name="phonegap-plugin-push" spec="1.9.2">
+    <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
+    <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
+    <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
+    <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
+    <plugin name="cordova-clipboard" spec="^1.2.1" />
+    <plugin name="nl.kingsquare.cordova.background-audio" spec="^1.0.1" />
+    <plugin name="phonegap-plugin-push" spec="1.11.1">
         <variable name="SENDER_ID" value="694767596569" />
     </plugin>
-    <plugin name="cordova-plugin-customurlscheme" spec="4.3.0">
+    <plugin name="cordova-plugin-customurlscheme" spec="^4.3.0">
         <variable name="URL_SCHEME" value="moodlemobile" />
     </plugin>
-    <plugin name="ionic-plugin-keyboard" spec="2.2.1" />
-    <plugin name="cordova-plugin-zip" spec="3.1.0" />
-    <plugin name="cordova-plugin-local-notifications-mm" />
-    <plugin name="cordova-plugin-file-opener2" spec="~2.0.19" />
-    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="~1.0.2" />
-    <plugin name="cordova-sqlite-evcore-extbuild-free" spec="~0.9.7" />
-    <plugin name="cordova-plugin-badge" spec="0.8.7" />
-    <engine name="android" spec="6.1.2" />
-    <engine name="ios" spec="4.3.1" />
+    <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
+    <plugin name="cordova-plugin-zip" spec="^3.1.0" />
+    <plugin name="cordova-plugin-local-notifications-mm" spec="^1.0.10" />
+    <plugin name="cordova-plugin-file-opener2" spec="^2.0.19" />
+    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.0" />
+    <plugin name="cordova-sqlite-evcore-extbuild-free" spec="^0.9.7" />
+    <plugin name="cordova-plugin-badge" spec="^0.8.7" />
+    <engine name="android" spec="7.0.0" />
+    <engine name="ios" spec="4.5.4" />
 </widget>
diff --git a/package.json b/package.json
index f3ced9ef8..007d42db8 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,8 @@
     "@types/node": "^8.0.47",
     "@types/promise.prototype.finally": "^2.0.2",
     "chart.js": "^2.7.2",
+    "cordova-android": "7.0.0",
+    "cordova-ios": "4.5.4",
     "font-awesome": "4.7.0",
     "ionic-angular": "^3.9.2",
     "ionicons": "3.0.0",
@@ -85,9 +87,7 @@
     "rxjs": "5.5.11",
     "sw-toolbox": "3.6.0",
     "ts-md5": "^1.2.2",
-    "zone.js": "0.8.26",
-    "cordova-android": "6.1.2",
-    "cordova-ios": "4.3.1"
+    "zone.js": "0.8.26"
   },
   "devDependencies": {
     "@ionic/app-scripts": "3.1.9",
@@ -167,4 +167,4 @@
       "confinement": "classic"
     }
   }
-}
+}
\ No newline at end of file

From 087bdea5abcfdbf8ae48a9b5ef7ecb55754924b4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 8 Aug 2018 14:13:58 +0200
Subject: [PATCH 2/3] MOBILE-2547 android: Install support-gradle plugin

---
 config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.xml b/config.xml
index c35b402e7..047f1e401 100644
--- a/config.xml
+++ b/config.xml
@@ -124,6 +124,9 @@
     <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.0" />
     <plugin name="cordova-sqlite-evcore-extbuild-free" spec="^0.9.7" />
     <plugin name="cordova-plugin-badge" spec="^0.8.7" />
+    <plugin name="cordova-android-support-gradle-release" spec="^1.4.4">
+        <variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" />
+    </plugin>
     <engine name="android" spec="7.0.0" />
     <engine name="ios" spec="4.5.4" />
 </widget>

From 2d3bfb766828e1ecba0ecf88b30c887365da26e5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 8 Aug 2018 14:42:16 +0200
Subject: [PATCH 3/3] MOBILE-2547 config: Update targetSdk to API 26

---
 config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index 047f1e401..ccf672871 100644
--- a/config.xml
+++ b/config.xml
@@ -23,7 +23,7 @@
     <preference name="webviewbounce" value="false" />
     <preference name="AppendUserAgent" value="MoodleMobile" />
     <preference name="android-minSdkVersion" value="19" />
-    <preference name="android-targetSdkVersion" value="19" />
+    <preference name="android-targetSdkVersion" value="26" />
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="BackupWebStorage" value="none" />