#244 #223 Fix RN 0.40 import

Author: wkh237

src/ios/RNFetchBlob/RNFetchBlob.h

@@ -5,14 +5,14 @@
 //
 
 //XXX: DO NO REMOVE THIS LINE IF YOU'RE USING IT ON RN > 0.40 PROJECT
-#define RN040_IMPORT
+
 
 
 #ifndef RNFetchBlob_h
 #define RNFetchBlob_h
 
 
-#ifdef RN040_IMPORT
+#if __has_include(<React/RCTAssert.h>)
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTBridge.h>

src/ios/RNFetchBlobFS.h

@@ -12,7 +12,8 @@
 #import "RNFetchBlob.h"
 
 #import <Foundation/Foundation.h>
-#ifdef RN040_IMPORT
+
+#if __has_include(<React/RCTAssert.h>)
 #import <React/RCTBridgeModule.h>
 #else
 #import "RCTBridgeModule.h"

src/ios/RNFetchBlobFS.m

@@ -13,7 +13,7 @@
 #import "IOS7Polyfill.h"
 @import AssetsLibrary;
 
-#ifdef RN040_IMPORT
+#if __has_include(<React/RCTAssert.h>)
 #import <React/RCTBridge.h>
 #import <React/RCTEventDispatcher.h>
 #else

src/ios/RNFetchBlobNetwork.h

@@ -10,7 +10,7 @@
 #import "RNFetchBlobProgress.h"
 #import "RNFetchBlobFS.h"
 
-#ifdef RN040_IMPORT
+#if __has_include(<React/RCTAssert.h>)
 #import <React/RCTBridgeModule.h>
 #else
 #import "RCTBridgeModule.h"

src/ios/RNFetchBlobNetwork.m

@@ -17,7 +17,7 @@
 #import <CommonCrypto/CommonDigest.h>
 #import "RNFetchBlobProgress.h"
 
-#ifdef RN040_IMPORT
+#if __has_include(<React/RCTAssert.h>)
 #import <React/RCTRootView.h>
 #import <React/RCTLog.h>
 #import <React/RCTEventDispatcher.h>

src/ios/RNFetchBlobReqBuilder.m

@@ -13,7 +13,7 @@
 #import "RNFetchBlobFS.h"
 #import "IOS7Polyfill.h"
 
-#ifdef RN040_IMPORT
+#if __has_include(<React/RCTAssert.h>)
 #import <React/RCTLog.h>
 #else
 #import "RCTLog.h"

src/scripts/prelink.js

@@ -21,19 +21,6 @@ try {
     console.log('adding OkHttp3 dependency to pre 0.28 project .. ok')
   }
 
-  if (VERSION < 0.40) {
-    console.log('Removing RN040_IMPORT for RN < 0.40 project ..')
-    glob('**/RNFetchBlob.h',{}, function(err, files) {
-      if(Array.isArray(files)) {
-        var target = process.cwd() + '/' + files[0];
-        console.log('\033[92mPatching .. \033[97m' + target);
-        var data = fs.readFileSync(target);
-        fs.writeFileSync(target, String(data).replace(/#define RN040_IMPORT/, ''));
-        console.log('done.')
-      }
-    })
-  }
-
   console.log('Add Android permissions => ' + (addAndroidPermissions == "true"))
 
   if(addAndroidPermissions) {