Merge remote-tracking branch 'upstream/master'

IntegrationTests/AppDelegate.m

@@ -9,7 +9,11 @@
 
 #import "AppDelegate.h"
 
+#if __has_include("RCTRootView.h")
+#import "RCTRootView.h"
+#else
 #import <React/RCTRootView.h>
+#endif
 
 @implementation AppDelegate
 

README.md

@@ -468,7 +468,7 @@ If `progressDivider` = 0, you will receive all `progressCallback` calls, default
                            for your project in XCode.
 
 
-### `stopDownload(jobId: number): Promise<void>`
+### `stopDownload(jobId: number): void`
 
 Abort the current download job with this ID. The partial file will remain on the filesystem.
 

RNFSManager.h

@@ -6,8 +6,17 @@
 //  Copyright (c) 2015 Johannes Lumpe. All rights reserved.
 //
 
+#if __has_include("RCTBridgeModule.h")
+#import "RCTBridgeModule.h"
+#else
 #import <React/RCTBridgeModule.h>
+#endif
+
+#if __has_include("RCTLog.h")
+#import "RCTLog.h"
+#else
 #import <React/RCTLog.h>
+#endif
 
 @interface RNFSManager : NSObject <RCTBridgeModule>
 

RNFSManager.m

@@ -7,11 +7,17 @@
 //
 
 #import "RNFSManager.h"
-#import <React/RCTBridge.h>
+
 #import "NSArray+Map.h"
 #import "Downloader.h"
 #import "Uploader.h"
+
+#if __has_include("RCTEventDispatcher.h")
+#import "RCTEventDispatcher.h"
+#else
 #import <React/RCTEventDispatcher.h>
+#endif
+
 #import <CommonCrypto/CommonDigest.h>
 
 @interface RNFSManager()