Skip to content

Commit e3218a0

Browse files
committed
Remove empty Swift file for Flipper (#27922)
Summary: Related to #27426 & #27565. The wish to not include an empty Swift file to trigger the correct Xcode settings was voiced in #27426 & #27565. [iOS] [Fixed] - Remove need for Swift file in the user’s project in order to use Flipper Pull Request resolved: #27922 Test Plan: An application created with the template, like so: ```bash react-native init --template=~/Code/React/react-native TestFlipper ``` …will successfully build, launch, and have Flipper connect. Differential Revision: D19690592 Pulled By: cpojer fbshipit-source-id: ee696e0d747d6338534b0c2d62029e64ece02cd3
1 parent 2c89e51 commit e3218a0

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

template/ios/HelloWorld.xcodeproj/project.pbxproj

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1717
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1818
2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
19-
37E9F8DD2399A8DD00F82F3E /* Swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E9F8DC2399A8DD00F82F3E /* Swift.swift */; };
2019
/* End PBXBuildFile section */
2120

2221
/* Begin PBXContainerItemProxy section */
@@ -50,7 +49,6 @@
5049
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = HelloWorld/main.m; sourceTree = "<group>"; };
5150
2D02E47B1E0B4A5D006451C7 /* HelloWorld-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloWorld-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5251
2D02E4901E0B4A5D006451C7 /* HelloWorld-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HelloWorld-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
53-
37E9F8DC2399A8DD00F82F3E /* Swift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Swift.swift; sourceTree = "<group>"; };
5452
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
5553
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
5654
/* End PBXFileReference section */
@@ -137,7 +135,6 @@
137135
83CBB9F61A601CBA00E9B192 = {
138136
isa = PBXGroup;
139137
children = (
140-
37E9F8DC2399A8DD00F82F3E /* Swift.swift */,
141138
13B07FAE1A68108700A75B9A /* HelloWorld */,
142139
832341AE1AAA6A7D00B99B32 /* Libraries */,
143140
00E356EF1AD99517003FC87E /* HelloWorldTests */,
@@ -403,7 +400,6 @@
403400
buildActionMask = 2147483647;
404401
files = (
405402
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
406-
37E9F8DD2399A8DD00F82F3E /* Swift.swift in Sources */,
407403
13B07FC11A68108700A75B9A /* main.m in Sources */,
408404
);
409405
runOnlyForDeploymentPostprocessing = 0;
@@ -456,7 +452,6 @@
456452
00E356F61AD99517003FC87E /* Debug */ = {
457453
isa = XCBuildConfiguration;
458454
buildSettings = {
459-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
460455
BUNDLE_LOADER = "$(TEST_HOST)";
461456
GCC_PREPROCESSOR_DEFINITIONS = (
462457
"DEBUG=1",
@@ -479,7 +474,6 @@
479474
00E356F71AD99517003FC87E /* Release */ = {
480475
isa = XCBuildConfiguration;
481476
buildSettings = {
482-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
483477
BUNDLE_LOADER = "$(TEST_HOST)";
484478
COPY_PHASE_STRIP = NO;
485479
INFOPLIST_FILE = HelloWorldTests/Info.plist;
@@ -502,7 +496,6 @@
502496
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
503497
CLANG_ENABLE_MODULES = YES;
504498
CURRENT_PROJECT_VERSION = 1;
505-
DEAD_CODE_STRIPPING = NO;
506499
INFOPLIST_FILE = HelloWorld/Info.plist;
507500
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
508501
OTHER_LDFLAGS = (
@@ -691,6 +684,12 @@
691684
GCC_WARN_UNUSED_FUNCTION = YES;
692685
GCC_WARN_UNUSED_VARIABLE = YES;
693686
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
687+
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
688+
LIBRARY_SEARCH_PATHS = (
689+
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
690+
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
691+
"\"$(inherited)\"",
692+
);
694693
MTL_ENABLE_DEBUG_INFO = YES;
695694
ONLY_ACTIVE_ARCH = YES;
696695
SDKROOT = iphoneos;
@@ -737,6 +736,12 @@
737736
GCC_WARN_UNUSED_FUNCTION = YES;
738737
GCC_WARN_UNUSED_VARIABLE = YES;
739738
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
739+
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
740+
LIBRARY_SEARCH_PATHS = (
741+
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
742+
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
743+
"\"$(inherited)\"",
744+
);
740745
MTL_ENABLE_DEBUG_INFO = NO;
741746
SDKROOT = iphoneos;
742747
VALIDATE_PRODUCT = YES;

template/ios/Swift.swift

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

0 commit comments

Comments
 (0)