From b2d87900ff5f8bdc4a31ed05d2ea1dda78f7d926 Mon Sep 17 00:00:00 2001 From: Andreas Hippler Date: Wed, 25 Oct 2017 21:31:26 +0200 Subject: [PATCH] fix ios11, update test environment --- .travis.yml | 2 +- LICENSE | 2 +- Makefile | 14 ++++++-------- .../WKWebViewJavascriptBridge.m | 1 + circle.yml | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa9b45ed..0dcbf560 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: objective-c -osx_image: xcode8.2 +osx_image: xcode9.0 script: - make test-travis-ci diff --git a/LICENSE b/LICENSE index 56b08241..2a952707 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2015 Marcus Westin, Antoine Lagadec +Copyright (c) 2011-2017 Marcus Westin, Antoine Lagadec Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/Makefile b/Makefile index 10ceb0a7..3875face 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,18 @@ test: xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \ - -destination 'platform=iOS Simulator,name=iPhone 7' + -destination 'platform=iOS Simulator,name=iPhone 8' xcodebuild test -workspace Example\ Apps/ExampleSwiftApp-iOS/ExampleSwiftApp-iOS.xcworkspace -scheme ExampleSwiftApp-iOS \ - -destination 'platform=iOS Simulator,name=iPhone 7' + -destination 'platform=iOS Simulator,name=iPhone 8' test-travis-ci: xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \ - -destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.4' \ - -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.3' \ - -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.1' + -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3.1' \ + -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.0.1' test-circle-ci: xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \ - -destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.4' \ - -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \ - -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1' + -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3.1' \ + -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.0.1' publish-pod: diff --git a/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m b/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m index 47667df6..73c923db 100644 --- a/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m +++ b/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m @@ -147,6 +147,7 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati [_base logUnkownMessage:url]; } decisionHandler(WKNavigationActionPolicyCancel); + return; } if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:decisionHandler:)]) { diff --git a/circle.yml b/circle.yml index 583080a5..af65f786 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: xcode: - version: 8.2 + version: 9.0 # dependencies: # override: # - brew install kylef/formulae/swiftenv