Skip to content

Commit cc94e02

Browse files
committed
migrated ios to RN41.2, bugs not included
1 parent 503eef5 commit cc94e02

21 files changed

+36
-36
lines changed

example/ios/example/AppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// IMPORTANT: if you're getting an Xcode error that RCCManager.h isn't found, you've probably ran "npm install"
99
// with npm ver 2. You'll need to "npm install" with npm 3 (see https://github.com/wix/react-native-navigation/issues/1)
1010

11-
#import "RCTRootView.h"
11+
#import <React/RCTRootView.h>
1212

1313
@implementation AppDelegate
1414

example/ios/exampleTests/exampleTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#import <UIKit/UIKit.h>
1111
#import <XCTest/XCTest.h>
1212

13-
#import "RCTLog.h"
14-
#import "RCTRootView.h"
13+
#import <React/RCTLog.h>
14+
#import <React/RCTRootView.h>
1515

1616
#define TIMEOUT_SECONDS 240
1717
#define TEXT_TO_LOOK_FOR @"Welcome to React Native!"

ios/Helpers/RCCTitleViewHelper.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import "RCCTitleViewHelper.h"
10-
#import "RCTConvert.h"
10+
#import <React/RCTConvert.h>
1111
#import "RCTHelpers.h"
1212

1313
@implementation RCCTitleView

ios/Helpers/RCTHelpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import <Foundation/Foundation.h>
10-
#import "RCTRootView.h"
10+
#import <React/RCTRootView.h>
1111

1212
@interface RCTHelpers : NSObject
1313
+(BOOL)removeYellowBox:(RCTRootView*)reactRootView;

ios/Helpers/RCTHelpers.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//
88

99
#import "RCTHelpers.h"
10-
#import "RCTView.h"
11-
#import "RCTScrollView.h"
12-
#import "RCTFont.h"
10+
#import <React/RCTView.h>
11+
#import <React/RCTScrollView.h>
12+
#import <React/RCTFont.h>
1313

1414
@implementation RCTHelpers
1515

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#import <UIKit/UIKit.h>
2-
#import "RCTBridge.h"
2+
#import <React/RCTBridge.h>
33
#import "MMDrawerController.h"
44
#import "RCCDrawerProtocol.h"
55

66

77
@interface RCCDrawerController : MMDrawerController <RCCDrawerDelegate>
88

99

10-
@end
10+
@end

ios/RCCDrawerController/RCCDrawerController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#import "RCCViewController.h"
33
#import "MMExampleDrawerVisualStateManager.h"
44
#import "RCCDrawerHelper.h"
5-
#import "RCTConvert.h"
5+
#import <React/RCTConvert.h>
66
#import "RCCManagerModule.h"
77

88
#define RCCDRAWERCONTROLLER_ANIMATION_DURATION 0.33f

ios/RCCDrawerController/RCCTheSideBarManagerViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#import "RCCTheSideBarManagerViewController.h"
1010
#import "RCCViewController.h"
1111
#import "RCCDrawerHelper.h"
12-
#import "RCTConvert.h"
12+
#import <React/RCTConvert.h>
1313

1414

1515
@interface RCCTheSideBarManagerViewController () <TheSidebarControllerDelegate>

ios/RCCLightBox.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#import "RCCLightBox.h"
22
#import "RCCManager.h"
3-
#import "RCTRootView.h"
4-
#import "RCTRootViewDelegate.h"
5-
#import "RCTConvert.h"
3+
#import <React/RCTRootView.h>
4+
#import <React/RCTRootViewDelegate.h>
5+
#import <React/RCTConvert.h>
66
#import "RCTHelpers.h"
77
#import <objc/runtime.h>
88

@@ -65,7 +65,7 @@ -(instancetype)initWithFrame:(CGRect)frame params:(NSDictionary*)params
6565
[self.reactView.contentView.layer addObserver:self forKeyPath:@"frame" options:0 context:nil];
6666
[self.reactView.contentView.layer addObserver:self forKeyPath:@"bounds" options:0 context:NULL];
6767

68-
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRNReload) name:RCTReloadNotification object:nil];
68+
// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRNReload) name:RCTReloadNotification object:nil];
6969
}
7070
return self;
7171
}

ios/RCCManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import <Foundation/Foundation.h>
2-
#import "RCTBridgeModule.h"
2+
#import <React/RCTBridgeModule.h>
33
#import <UIKit/UIKit.h>
44

55
@interface RCCManager : NSObject

0 commit comments

Comments
 (0)