Upgrade RN 0.40 Finalization (#678)

* Header changes

* update the IOS header linker

* header swap
This commit is contained in:
BO KANG
2017-01-24 10:14:49 -08:00
committed by GitHub
parent 5448892d57
commit e42485243d
5 changed files with 22 additions and 3 deletions

View File

@@ -370,7 +370,6 @@
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../Examples/CodePushDemoApp/node_modules/react-native/React/**",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = (
@@ -389,7 +388,6 @@
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../Examples/CodePushDemoApp/node_modules/react-native/React/**",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = (

View File

@@ -1,5 +1,7 @@
#if __has_include("RCTEventEmitter.h")
#if __has_include(<React/RCTEventEmitter.h>)
#import <React/RCTEventEmitter.h>
#elif __has_include("RCTEventEmitter.h")
#import "RCTEventEmitter.h"
#else
#import "React/RCTEventEmitter.h" // Required when used as a Pod in a Swift project
#endif

View File

@@ -1,9 +1,18 @@
#if __has_include(<React/RCTAssert.h>)
#import <React/RCTAssert.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTConvert.h>
#import <React/RCTEventDispatcher.h>
#import <React/RCTRootView.h>
#import <React/RCTUtils.h>
#else // back compatibility for RN version < 0.40
#import "RCTAssert.h"
#import "RCTBridgeModule.h"
#import "RCTConvert.h"
#import "RCTEventDispatcher.h"
#import "RCTRootView.h"
#import "RCTUtils.h"
#endif
#import "CodePush.h"

View File

@@ -1,5 +1,10 @@
#import "CodePush.h"
#if __has_include(<React/RCTConvert.h>)
#import <React/RCTConvert.h>
#else
#import "RCTConvert.h"
#endif
// Extending the RCTConvert class allows the React Native
// bridge to handle args of type "CodePushInstallMode"

View File

@@ -1,5 +1,10 @@
#import "CodePush.h"
#if __has_include(<React/RCTConvert.h>)
#import <React/RCTConvert.h>
#else
#import "RCTConvert.h"
#endif
// Extending the RCTConvert class allows the React Native
// bridge to handle args of type "CodePushUpdateState"