Merge branch 'hotfix/2.0.2'

wordpress-clients · Apr 12, 2017 · 7ceda99 · 7ceda99
2 parents f1db77c + ca4cec9
commit 7ceda99
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="2.0.2"></a>
+### 2.0.2 (2017-04-12)
+
+* Downgrade Android-cordova due to <http://stackoverflow.com/questions/43195668/cordova-error-using-cordova-android-6-2-0-getfileresources-is-not-a-function>
+
+To upgrade:
+
+```
+$ git fetch --all
+$ git checkout v2.0.2
+$ yarn
+$ rm -rf platforms/ plugins/
+$ npm run restore
+```
+
 <a name="2.0.1"></a>
 ### 2.0.1 (2016-12-28)
 

diff --git a/dist/config.xml b/dist/config.xml
@@ -20,8 +20,8 @@
     <preference name="ShowSplashScreenSpinner" value="false"/>
     <preference name="AutoHideSplashScreen" value="false"/>
     <!-- ANDROID -->
-    <preference name="android-minSdkVersion" value="14"/>
-    <preference name="android-targetSdkVersion" value="14"/>
+    <preference name="android-minSdkVersion" value="16"/>
+    <preference name="android-targetSdkVersion" value="16"/>
     <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect"/>
     <preference name="xwalkMode" value="embedded"/>
     <preference name="xwalkMultipleApk" value="true"/>

diff --git a/package.json b/package.json
@@ -129,8 +129,8 @@
   "cordovaPlatforms": [
     {
       "platform": "android",
-      "version": "6.x",
-      "locator": "android@6.x"
+      "version": "6.1",
+      "locator": "android@6.1"
     },
     {
       "platform": "ios",