From ab25f7bf5e3a97965a436244f8d868926be7d8e9 Mon Sep 17 00:00:00 2001 From: Alexis Bronchart Date: Tue, 23 Jan 2018 12:57:15 +0100 Subject: [PATCH] updated to xcode 9 recommended settings --- .gitignore | 3 ++- ios/RCTWKWebView.xcodeproj/project.pbxproj | 18 +++++++++++++++++- ios/RCTWKWebView/RCTWKWebViewManager.m | 5 ++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ccd8db46..9195503e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store */.DS_Store -ios/RCTWKWebView.xcodeproj/xcuserdata/* \ No newline at end of file +ios/RCTWKWebView.xcodeproj/xcuserdata/* +ios/RCTWKWebView.xcodeproj/project.xcworkspace/xcuserdata/* diff --git a/ios/RCTWKWebView.xcodeproj/project.pbxproj b/ios/RCTWKWebView.xcodeproj/project.pbxproj index 8c79106b..6c78c6ad 100644 --- a/ios/RCTWKWebView.xcodeproj/project.pbxproj +++ b/ios/RCTWKWebView.xcodeproj/project.pbxproj @@ -104,7 +104,7 @@ 097457921D2A440A000D9368 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0730; + LastUpgradeCheck = 0920; TargetAttributes = { 097457991D2A440A000D9368 = { CreatedOnToolsVersion = 7.3.1; @@ -151,13 +151,21 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; @@ -194,13 +202,21 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; diff --git a/ios/RCTWKWebView/RCTWKWebViewManager.m b/ios/RCTWKWebView/RCTWKWebViewManager.m index f7d2bb1e..29afc3cb 100644 --- a/ios/RCTWKWebView/RCTWKWebViewManager.m +++ b/ios/RCTWKWebView/RCTWKWebViewManager.m @@ -46,7 +46,10 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(onMessage, RCTDirectEventBlock) RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock) RCT_EXPORT_VIEW_PROPERTY(hideKeyboardAccessoryView, BOOL) -RCT_REMAP_VIEW_PROPERTY(allowsLinkPreview, _webView.allowsLinkPreview, BOOL) +if (@available(iOS 9, *)) +{ + RCT_REMAP_VIEW_PROPERTY(allowsLinkPreview, _webView.allowsLinkPreview, BOOL) +} RCT_EXPORT_METHOD(goBack:(nonnull NSNumber *)reactTag) {