Skip to content

fix(ios): replace LaunchScreen.storyboard with UILaunchScreen #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2023
Merged

fix(ios): replace LaunchScreen.storyboard with UILaunchScreen #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ios/ReactTestApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
19ECD0D8232ED425003D8557 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19ECD0D7232ED425003D8557 /* SceneDelegate.swift */; };
19ECD0DA232ED425003D8557 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19ECD0D9232ED425003D8557 /* ContentView.swift */; };
19ECD0DC232ED427003D8557 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 19ECD0DB232ED427003D8557 /* Assets.xcassets */; };
19ECD0E2232ED427003D8557 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 19ECD0E0232ED427003D8557 /* LaunchScreen.storyboard */; };
19ECD0ED232ED428003D8557 /* ReactTestAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19ECD0EC232ED428003D8557 /* ReactTestAppTests.swift */; };
19ECD0F8232ED428003D8557 /* ReactTestAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19ECD0F7232ED428003D8557 /* ReactTestAppUITests.swift */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -60,7 +59,6 @@
19ECD0D7232ED425003D8557 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
19ECD0D9232ED425003D8557 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
19ECD0DB232ED427003D8557 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = SOURCE_ROOT; };
19ECD0E1232ED427003D8557 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
19ECD0E3232ED427003D8557 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
19ECD0E8232ED427003D8557 /* ReactTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReactTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
19ECD0EC232ED428003D8557 /* ReactTestAppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactTestAppTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -132,7 +130,6 @@
1988282224105BCC005057FF /* UIViewController+ReactTestApp.h */,
1988284424105BEC005057FF /* UIViewController+ReactTestApp.m */,
19ECD0DB232ED427003D8557 /* Assets.xcassets */,
19ECD0E0232ED427003D8557 /* LaunchScreen.storyboard */,
19ECD0E3232ED427003D8557 /* Info.plist */,
196C7216232F6CD9006556ED /* ReactTestApp.entitlements */,
192F052724AD3CC500A48456 /* ReactTestApp.common.xcconfig */,
Expand Down Expand Up @@ -267,7 +264,6 @@
buildActionMask = 2147483647;
files = (
19ECD0DC232ED427003D8557 /* Assets.xcassets in Resources */,
19ECD0E2232ED427003D8557 /* LaunchScreen.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -358,17 +354,6 @@
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
19ECD0E0232ED427003D8557 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
19ECD0E1232ED427003D8557 /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
19ECD0FA232ED428003D8557 /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down
25 changes: 0 additions & 25 deletions ios/ReactTestApp/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ios/ReactTestApp/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
</array>
</dict>
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UILaunchScreen</key>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out this requires iOS 14+ so I retargeted to the 3.0 branch. I will also have to bump iOS minimum version.

<dict/>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
Expand Down
1 change: 0 additions & 1 deletion test/pack.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ describe("npm pack", () => {
"ios/ReactTestApp/AppRegistryModule.mm",
"ios/ReactTestApp/Assets.xcassets/AppIcon.appiconset/Contents.json",
"ios/ReactTestApp/Assets.xcassets/Contents.json",
"ios/ReactTestApp/Base.lproj/LaunchScreen.storyboard",
"ios/ReactTestApp/ContentView.swift",
"ios/ReactTestApp/Info.plist",
"ios/ReactTestApp/Manifest+Decoder.swift",
Expand Down