Merge branch 'release/2.0.0-beta16'

BUILD.md

@@ -75,7 +75,7 @@ If your device is connected and in USB mode you will see your application that y
 
 ## iOS
 
-### Preriquisites
+### Prerequisites
 
 * OSX
 * XCode

CHANGELOG.md

@@ -16,6 +16,23 @@
 * [CONFIG] There is no more dev/prod distinction, WPHC turn debug OFF when building the prod app automatically.
 * [ABOUT] The About feature has been removed. You can use Pages to achieve the same purpose.
 
+<a name="2.0.0-beta16"></a>
+### 2.0.0-beta16 (2016-11-12)
+
+To upgrade:
+
+```
+$ git fetch --all
+$ git checkout v2.0.0-beta16
+$ npm i
+$ npm run restore
+```
+
+* upgrade cordova-ios
+* upgrade cordova-android (API 25)
+* upgrade crosswalk
+* add more logs to admobs
+
 <a name="2.0.0-beta15"></a>
 ### 2.0.0-beta15 (2016-11-01)
 

README.md

@@ -60,6 +60,7 @@
   * https://itunes.apple.com/nl/app/regio25/id1067826417?mt=8
   * https://itunes.apple.com/nl/app/jonginnop/id1073451236?mt=8
   * https://itunes.apple.com/us/app/id1132170549
+  * https://itunes.apple.com/us/app/suz-blog/id1145036348
 
 ## Quick Start
 
@@ -162,4 +163,4 @@ It's always best to create two smaller PRs than one big one.
 
 ### Style
 
-Follow .editconfig 
+Follow .editconfig 

RELEASE.md

@@ -71,6 +71,16 @@ Once the IPA is signed, all you need to do is sending the package to Apple for r
 
 ### Frequent errors
 
-#### Submitting iOS app to app store application identifier invalid
+#### iOS: Submitting iOS app to app store application identifier invalid
 
 <http://stackoverflow.com/questions/20120128/submitting-ios-app-to-app-store-application-identifier-invalid>
+
+#### iOS: Signing for "XXXX" requires a development team. Select a development team in the project editor.
+
+<http://stackoverflow.com/questions/39524148/requires-a-development-team-select-a-development-team-in-the-project-editor-cod>
+
+#### iOS: duplicate symbols for architecture armv7
+
+<http://stackoverflow.com/questions/39512823/duplicate-symbols-for-architecture-arm64-after-xcode-8-0-update>
+
+![image](https://cloud.githubusercontent.com/assets/1388706/20237394/2d95e7de-a8d1-11e6-9e84-139808b559d2.png)

dist/config.cson

@@ -1,7 +1,7 @@
 "title": "Your Blog title"
 
 "api":
-    "baseUrl": "http://dev.julienrenaux.fr/wp-json"
+    "baseUrl": "https://dev.julienrenaux.fr/wp-json"
     "timeout": 10000
     "maxAttempt": 3
 

dist/config.xml

@@ -22,10 +22,11 @@
     <!-- ANDROID -->
     <preference name="android-minSdkVersion" value="14"/>
     <preference name="android-targetSdkVersion" value="14"/>
-    <preference name="xwalkVersion" value="14+"/>
     <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect"/>
     <preference name="xwalkMode" value="embedded"/>
     <preference name="xwalkMultipleApk" value="true"/>
+    <!-- Uncomment the following line to use Crosswalk lite => reduces apk size -->
+    <!--<preference name="xwalkMode" value="lite" />-->
     <preference name="CrosswalkAnimatable" value="true" />
     <preference name="android-windowSoftInputMode" value="adjustNothing" />
     <feature name="StatusBar">

lib/cordova/cordova.admob.js

@@ -2,13 +2,13 @@ module.exports = angular.module('wordpress-hybrid-client.cordova')
     .run(($log, $WPHCConfig, $ionicPlatform) => {
         'ngInject';
 
-        $log.info('[admob]');
-
         if (!_.get($WPHCConfig, 'cordova.admob.enabled')) {
             $log.info('[admob] disabled');
             return;
         }
 
+        $log.info('[admob] enabled');
+
         $ionicPlatform.ready(() => {
             let bannerID = null;
             let interstitialID = null;
@@ -26,6 +26,12 @@ module.exports = angular.module('wordpress-hybrid-client.cordova')
                 interstitialID = _.get($WPHCConfig, 'cordova.admob.windows.interstitialID');
                 bannerPosition = _.get($WPHCConfig, 'cordova.admob.windows.bannerPosition');
             }
+            $log.info('[admob] API exists?', typeof AdMob !== 'undefined');
+            $log.debug('[admob] config', {
+                bannerID,
+                interstitialID,
+                bannerPosition
+            });
 
             if (AdMob && interstitialID) {
                 AdMob.prepareInterstitial({

package.json

@@ -1,12 +1,12 @@
 {
   "name": "wordpress-hybrid-client",
-  "version": "2.0.0-beta15",
+  "version": "2.0.0-beta16",
   "title": "wordpress-hybrid-client",
   "description": "AngularJS client using Ionic Framework and based on the json-rest-api plugin: https://wordpress.org/plugins/json-rest-api/ with CORS enabled.",
   "main": "index.js",
   "scripts": {
     "build": "bash ./release.sh",
-    "restore": "ionic state restore",
+    "restore": "rm -rf platforms/ plugins/ && ionic state restore",
     "postinstall": "npm run installWPHC",
     "installWPHC": "cd scripts && node ./install.js",
     "increaseVersion": "cd scripts && node ./increaseVersion.js",
@@ -112,7 +112,7 @@
     "[email protected]",
     "[email protected]",
     "[email protected]",
-    "cordova-plugin-crosswalk-webview@1.6.0",
+    "cordova-plugin-crosswalk-webview@2.2.0",
     "[email protected]",
     "[email protected]",
     "[email protected]",
@@ -121,9 +121,13 @@
   "cordovaPlatforms": [
     {
       "platform": "android",
-      "version": "5.x",
-      "locator": "android@5.x"
+      "version": "6.x",
+      "locator": "android@6.x"
     },
-    "ios"
+    {
+      "platform": "ios",
+      "version": "4.x",
+      "locator": "[email protected]"
+    }
   ]
 }