You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2015/03/13 21:00:31 UTC
cordova-plugins git commit: CB-8666 - Update CDVWKWebViewEngine
plugin to use 4.0.x branch code
Repository: cordova-plugins
Updated Branches:
refs/heads/master 63975a8f4 -> f53842bc5
CB-8666 - Update CDVWKWebViewEngine plugin to use 4.0.x branch code
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugins/commit/f53842bc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugins/tree/f53842bc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugins/diff/f53842bc
Branch: refs/heads/master
Commit: f53842bc5c13a1a2effe3f3159c856a2ca674fb6
Parents: 63975a8
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Mar 13 13:00:33 2015 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 13 13:00:33 2015 -0700
----------------------------------------------------------------------
local-webserver/plugin.xml | 2 +-
wkwebview-engine/README.md | 8 ++++----
wkwebview-engine/plugin.xml | 4 ++--
wkwebview-engine/src/ios/CDVWKWebViewEngine.m | 1 +
4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/f53842bc/local-webserver/plugin.xml
----------------------------------------------------------------------
diff --git a/local-webserver/plugin.xml b/local-webserver/plugin.xml
index 0953bbf..5fd3e4d 100644
--- a/local-webserver/plugin.xml
+++ b/local-webserver/plugin.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<plugin id="org.apache.cordova.labs.local-webserver" version="2.2.1" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="org.apache.cordova.labs.local-webserver" version="2.3.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<name>CordovaLocalWebServer</name>
<description>Cordova Local Web Server Plugin</description>
<keywords>cordova,local web server</keywords>
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/f53842bc/wkwebview-engine/README.md
----------------------------------------------------------------------
diff --git a/wkwebview-engine/README.md b/wkwebview-engine/README.md
index 836e8ef..d810624 100644
--- a/wkwebview-engine/README.md
+++ b/wkwebview-engine/README.md
@@ -5,19 +5,19 @@ This plugin makes `Cordova` use the `WKWebView` component (new in iOS 8.0) inste
This will also install the `Cordova Local WebServer` plugin.
-This plugin currently needs to use the `wkwebview` branch of `cordova-ios`.
+This plugin currently needs to use the `4.0.x` branch of `cordova-ios`.
To `alpha test` this:
-You may have to remove the cached wkwebview platform:
+You may have to remove the cached 4.0.x platform:
- rm -rf ~/.cordova/lib/ios/cordova/wkwebview
+ rm -rf ~/.cordova/lib/ios/cordova/4.0.x
Then:
cordova create wkwvtest my.project.id wkwvtest
cd wkwvtest
- cordova platform add ios@wkwebview --usegit
+ cordova platform add ios@4.0.x --usegit
cordova plugin add https://github.com/apache/cordova-plugins.git#master:wkwebview-engine
Permissions
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/f53842bc/wkwebview-engine/plugin.xml
----------------------------------------------------------------------
diff --git a/wkwebview-engine/plugin.xml b/wkwebview-engine/plugin.xml
index e734892..0e68120 100644
--- a/wkwebview-engine/plugin.xml
+++ b/wkwebview-engine/plugin.xml
@@ -4,7 +4,7 @@
xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.labs.wkwebviewengine"
- version="0.1.0">
+ version="0.2.0">
<name>Cordova WKWebView Engine</name>
<description>Cordova WKWebView Engine Plugin</description>
<license>Apache 2.0</license>
@@ -12,7 +12,7 @@
<repo>https://git-wip-us.apache.org/repos/asf/cordova-plugins.git</repo>
<engines>
- <engine name="cordova" version=">3.7.0" />
+ <engine name="cordova" version=">=4.0.0" />
</engines>
<dependency id="org.apache.cordova.labs.local-webserver" url="https://git-wip-us.apache.org/repos/asf/cordova-plugins.git#master:local-webserver" version=">=2.1.0" />
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/f53842bc/wkwebview-engine/src/ios/CDVWKWebViewEngine.m
----------------------------------------------------------------------
diff --git a/wkwebview-engine/src/ios/CDVWKWebViewEngine.m b/wkwebview-engine/src/ios/CDVWKWebViewEngine.m
index de69ddd..c19d7e2 100644
--- a/wkwebview-engine/src/ios/CDVWKWebViewEngine.m
+++ b/wkwebview-engine/src/ios/CDVWKWebViewEngine.m
@@ -19,6 +19,7 @@
#import "CDVWKWebViewEngine.h"
#import "CDVWKWebViewUIDelegate.h"
+#import <Cordova/NSDictionary+CordovaPreferences.h>
#import <objc/message.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org