Merge branch 'master' into mr/cve-2020-6506

apple/RNCWebView.h

@@ -64,7 +64,9 @@
 @property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
 @property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
 @property (nonatomic, assign) BOOL pullToRefreshEnabled;
+#if !TARGET_OS_OSX
 @property (nonatomic, weak) UIRefreshControl * refreshControl;
+#endif
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
 @property (nonatomic, assign) WKContentMode contentMode;
@@ -78,7 +80,9 @@
 - (void)goBack;
 - (void)reload;
 - (void)stopLoading;
+#if !TARGET_OS_OSX
 - (void)addPullToRefreshControl;
 - (void)pullToRefresh:(UIRefreshControl *)refreshControl;
+#endif
 
 @end

apple/RNCWebView.m

@@ -1136,7 +1136,7 @@ static NSDictionary* customCertificatesForHost;
     [_webView reload];
   }
 }
-
+#if !TARGET_OS_OSX
 - (void)addPullToRefreshControl
 {
     UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
@@ -1151,7 +1151,7 @@ static NSDictionary* customCertificatesForHost;
     [refreshControl endRefreshing];
 }
 
-#if !TARGET_OS_OSX
+
 - (void)setPullToRefreshEnabled:(BOOL)pullToRefreshEnabled
 {
     _pullToRefreshEnabled = pullToRefreshEnabled;

package.json

@@ -8,7 +8,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "10.9.1",
+  "version": "10.9.2",
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

react-native-webview.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
 
   s.authors      = package['author']
   s.homepage     = package['homepage']
-  s.platforms    = { :ios => "9.0", :osx => "10.14" }
+  s.platforms    = { :ios => "9.0", :osx => "10.13" }
 
   s.source       = { :git => "https://github.com/react-native-community/react-native-webview.git", :tag => "v#{s.version}" }
   s.source_files  = "apple/**/*.{h,m}"