Merge branch 'master' into janpio-add_ci_platform
diff --git a/.appveyor.yml b/.appveyor.yml
index b809425..8b6be4c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,9 +15,9 @@
PLATFORM: windows-10-store
JUST_BUILD: --justBuild
matrix:
- - nodejs_version: "6"
- nodejs_version: "8"
- nodejs_version: "10"
+ - nodejs_version: "12"
platform:
- x86
diff --git a/.travis.yml b/.travis.yml
index 478a42b..e82f50c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,10 @@
env:
global:
- SAUCE_USERNAME=snay
- - TRAVIS_NODE_VERSION=6
+ - TRAVIS_NODE_VERSION=8
language: node_js
-node_js: 6
+node_js: 8
# yaml anchor/alias: https://medium.com/@tommyvn/travis-yml-dry-with-anchors-8b6a3ac1b027
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 84d9025..55ee188 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,6 +21,13 @@
# Release Notes
+### 1.2.1 (Jul 20, 2019)
+
+- fix: Revert "CB-13987: (ios) Fix WKWebView doesn't layout properly at… ([#107](https://github.com/apache/cordova-plugin-wkwebview-engine/issues/107)) ([`dc8b277`](https://github.com/apache/cordova-plugin-wkwebview-engine/commit/dc8b277))
+- ci(travis): upgrade to node8 ([`d8c8b3f`](https://github.com/apache/cordova-plugin-wkwebview-engine/commit/d8c8b3f))
+- ci(appveyor): replace node 6 with node 12 ([`557e275`](https://github.com/apache/cordova-plugin-wkwebview-engine/commit/557e275))
+
+
### 1.2.0 (Jun 27, 2019)
- build: add `.gitattributes` to force LF (instead of possible CRLF on Windows) ([`797f088`](https://github.com/apache/cordova-plugin-wkwebview-engine/commit/797f088))
diff --git a/package.json b/package.json
index 7469108..e8c20d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-wkwebview-engine",
- "version": "1.2.1-dev",
+ "version": "1.2.2-dev",
"description": "The official Apache Cordova WKWebView Engine Plugin",
"main": "index.js",
"repository": {
diff --git a/plugin.xml b/plugin.xml
index 27916d6..d4af280 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -22,7 +22,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-wkwebview-engine"
- version="1.2.1-dev">
+ version="1.2.2-dev">
<name>Cordova WKWebView Engine</name>
<description>Cordova WKWebView Engine Plugin</description>
<license>Apache 2.0</license>
diff --git a/src/ios/CDVWKWebViewEngine.m b/src/ios/CDVWKWebViewEngine.m
index b337548..16a0cb7 100644
--- a/src/ios/CDVWKWebViewEngine.m
+++ b/src/ios/CDVWKWebViewEngine.m
@@ -97,13 +97,6 @@
// re-create WKWebView, since we need to update configuration
WKWebView* wkWebView = [[WKWebView alloc] initWithFrame:self.engineWebView.frame configuration:configuration];
-
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
- if (@available(iOS 11.0, *)) {
- [wkWebView.scrollView setContentInsetAdjustmentBehavior:UIScrollViewContentInsetAdjustmentNever];
- }
-#endif
-
wkWebView.UIDelegate = self.uiDelegate;
self.engineWebView = wkWebView;
diff --git a/tests/package.json b/tests/package.json
index 4f65da3..3d05daa 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-wkwebview-engine-tests",
- "version": "1.2.1-dev",
+ "version": "1.2.2-dev",
"description": "",
"cordova": {
"id": "cordova-plugin-wkwebview-engine-tests",
diff --git a/tests/plugin.xml b/tests/plugin.xml
index eb2b057..6194932 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -20,7 +20,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-wkwebview-engine-tests"
- version="1.2.1-dev">
+ version="1.2.2-dev">
<name>cordova-plugin-wkwebview-engine Tests</name>
<license>Apache 2.0</license>
