From a422592c95398f8c2ef04ecaf082463f5a7a843c Mon Sep 17 00:00:00 2001 From: Jiayan Zhuang Date: Tue, 4 Aug 2020 09:07:16 -0700 Subject: [PATCH] Delete WEBKIT_IOS_10_APIS_AVAILABLE Summary: Changelog: [Internal][Removed] - Delete WEBKIT_IOS_10_APIS_AVAILABLE because React Native doesn't support iOS 9 and WEBKIT_IOS_10_APIS_AVAILABLE would always be true. Reviewed By: PeteTheHeat Differential Revision: D22768504 fbshipit-source-id: 76dbf967260b26ee6c0a45d8ae099f137a3a4ec7 --- React/Base/RCTConvert.h | 4 ++-- React/Base/RCTConvert.m | 2 -- React/Base/RCTDefines.h | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h index 31df920476..09a380e84d 100644 --- a/React/Base/RCTConvert.h +++ b/React/Base/RCTConvert.h @@ -15,7 +15,7 @@ #import #import #import -#if TARGET_OS_IPHONE && WEBKIT_IOS_10_APIS_AVAILABLE +#if TARGET_OS_IPHONE #import #endif @@ -73,7 +73,7 @@ typedef NSURL RCTFileURL; + (UIDataDetectorTypes)UIDataDetectorTypes:(id)json; #endif -#if TARGET_OS_IPHONE && WEBKIT_IOS_10_APIS_AVAILABLE +#if TARGET_OS_IPHONE + (WKDataDetectorTypes)WKDataDetectorTypes:(id)json; #endif diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index 159414228a..f3588b38ec 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -430,7 +430,6 @@ RCT_MULTI_ENUM_CONVERTER( UIDataDetectorTypePhoneNumber, unsignedLongLongValue) -#if WEBKIT_IOS_10_APIS_AVAILABLE RCT_MULTI_ENUM_CONVERTER( WKDataDetectorTypes, (@{ @@ -446,7 +445,6 @@ RCT_MULTI_ENUM_CONVERTER( }), WKDataDetectorTypePhoneNumber, unsignedLongLongValue) -#endif // WEBKIT_IOS_10_APIS_AVAILABLE #endif // !TARGET_OS_TV diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h index 031864730a..23be65eb5c 100644 --- a/React/Base/RCTDefines.h +++ b/React/Base/RCTDefines.h @@ -142,8 +142,3 @@ @throw _RCTNotImplementedException(_cmd, [self class]); \ } \ _Pragma("clang diagnostic pop") - -/** - * Check if WebKit iOS 10.0 APIs are available. - */ -#define WEBKIT_IOS_10_APIS_AVAILABLE __has_include()