Skip to content

Commit 87a7cb3

Browse files
committed
Fix search paths and push forward with the app
1 parent ed06e97 commit 87a7cb3

6 files changed

Lines changed: 19 additions & 140 deletions

File tree

packages/ios-test-app/RNTestApp/RNTestApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,12 @@
155155
CURRENT_PROJECT_VERSION = 1;
156156
GENERATE_INFOPLIST_FILE = YES;
157157
HEADER_SEARCH_PATHS = (
158-
"/Users/cipolleschi/Official/react-native/packages/react-native/.build/headers",
159-
"/Users/cipolleschi/Official/react-native/packages/react-native/ReactCommon/yoga",
158+
"$(PROJECT_DIR)/../../react-native/ReactCommon/yoga",
159+
"$(PROJECT_DIR)/../../react-native/.build/headers",
160160
);
161161
INFOPLIST_FILE = RNTestApp/Info.plist;
162162
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
163163
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
164-
INFOPLIST_KEY_UIMainStoryboardFile = Main;
165164
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
166165
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
167166
LD_RUNPATH_SEARCH_PATHS = (
@@ -185,13 +184,12 @@
185184
CURRENT_PROJECT_VERSION = 1;
186185
GENERATE_INFOPLIST_FILE = YES;
187186
HEADER_SEARCH_PATHS = (
188-
"/Users/cipolleschi/Official/react-native/packages/react-native/.build/headers",
189-
"/Users/cipolleschi/Official/react-native/packages/react-native/ReactCommon/yoga",
187+
"$(PROJECT_DIR)/../../react-native/ReactCommon/yoga",
188+
"$(PROJECT_DIR)/../../react-native/.build/headers",
190189
);
191190
INFOPLIST_FILE = RNTestApp/Info.plist;
192191
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
193192
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
194-
INFOPLIST_KEY_UIMainStoryboardFile = Main;
195193
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
196194
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
197195
LD_RUNPATH_SEARCH_PATHS = (

packages/ios-test-app/RNTestApp/RNTestApp/AppDelegate.m

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,31 @@
77

88
#import "AppDelegate.h"
99

10+
#import <React/RCTBundleURLProvider.h>
11+
#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
12+
1013
@interface AppDelegate ()
1114

1215
@end
1316

1417
@implementation AppDelegate
1518

16-
1719
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
1820
// Override point for customization after application launch.
21+
22+
self.reactNativeFactory = [[RCTReactNativeFactory alloc] initWithDelegate:self];
23+
self.dependencyProvider = [RCTAppDependencyProvider new];
24+
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
25+
[self.reactNativeFactory startReactNativeWithModuleName:@"RNTesterApp"
26+
inWindow:self.window
27+
initialProperties:@{}
28+
launchOptions:launchOptions];
1929
return YES;
2030
}
2131

22-
23-
#pragma mark - UISceneSession lifecycle
24-
25-
26-
- (UISceneConfiguration *)application:(UIApplication *)application configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession options:(UISceneConnectionOptions *)options {
27-
// Called when a new scene session is being created.
28-
// Use this method to select a configuration to create the new scene with.
29-
return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" sessionRole:connectingSceneSession.role];
32+
- (NSURL *)bundleURL
33+
{
34+
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"js/RNTesterApp.ios"];
3035
}
3136

32-
33-
- (void)application:(UIApplication *)application didDiscardSceneSessions:(NSSet<UISceneSession *> *)sceneSessions {
34-
// Called when the user discards a scene session.
35-
// If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
36-
// Use this method to release any resources that were specific to the discarded scenes, as they will not return.
37-
}
38-
39-
4037
@end

packages/ios-test-app/RNTestApp/RNTestApp/Base.lproj/Main.storyboard

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>UIApplicationSceneManifest</key>
6-
<dict>
7-
<key>UIApplicationSupportsMultipleScenes</key>
8-
<false/>
9-
<key>UISceneConfigurations</key>
10-
<dict>
11-
<key>UIWindowSceneSessionRoleApplication</key>
12-
<array>
13-
<dict>
14-
<key>UISceneConfigurationName</key>
15-
<string>Default Configuration</string>
16-
<key>UISceneDelegateClassName</key>
17-
<string>SceneDelegate</string>
18-
<key>UISceneStoryboardFile</key>
19-
<string>Main</string>
20-
</dict>
21-
</array>
22-
</dict>
23-
</dict>
24-
</dict>
4+
<dict/>
255
</plist>

packages/ios-test-app/RNTestApp/RNTestApp/SceneDelegate.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

packages/ios-test-app/RNTestApp/RNTestApp/SceneDelegate.m

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)