Skip to content

Commit c7d1776

Browse files
wangjoshuahkelset
wangjoshuah
authored and
kelset
committed
Update template to Xcode 9.4 and fix project settings warnings (facebook#19626)
Summary: Motivation: Fix Xcode Project Settings Warnings ![screenshot 2018-06-08 10 58 23](https://user-images.githubusercontent.com/5353594/41173274-1a4fbb3e-6b0b-11e8-973b-8290794a4f8b.png) Should still build and pass all tests since project settings changes should be safe changes. No documentation change is required [IOS][MINOR][XcodeProjs] Upgraded Project settings to be compatible with Xcode 9.4 Pull Request resolved: facebook#19626 Differential Revision: D9211230 Pulled By: hramos fbshipit-source-id: ef8692871bffbdb5dd0214f65220fd171c203c6c
1 parent 770d08b commit c7d1776

File tree

6 files changed

+60
-9
lines changed

6 files changed

+60
-9
lines changed

‎Libraries/Sample/Sample.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
58B511D31A9E6C8500147676 /* Project object */ = {
8686
isa = PBXProject;
8787
attributes = {
88-
LastUpgradeCheck = 0610;
88+
LastUpgradeCheck = 0940;
8989
ORGANIZATIONNAME = Facebook;
9090
TargetAttributes = {
9191
58B511DA1A9E6C8500147676 = {
@@ -130,19 +130,31 @@
130130
CLANG_CXX_LIBRARY = "libc++";
131131
CLANG_ENABLE_MODULES = YES;
132132
CLANG_ENABLE_OBJC_ARC = YES;
133+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
133134
CLANG_WARN_BOOL_CONVERSION = YES;
135+
CLANG_WARN_COMMA = YES;
134136
CLANG_WARN_CONSTANT_CONVERSION = YES;
137+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
135138
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
136139
CLANG_WARN_EMPTY_BODY = YES;
137140
CLANG_WARN_ENUM_CONVERSION = YES;
141+
CLANG_WARN_INFINITE_RECURSION = YES;
138142
CLANG_WARN_INT_CONVERSION = YES;
143+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
144+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
145+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
139146
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
147+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
148+
CLANG_WARN_STRICT_PROTOTYPES = YES;
149+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
140150
CLANG_WARN_UNREACHABLE_CODE = YES;
141151
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
142152
COPY_PHASE_STRIP = NO;
143153
ENABLE_STRICT_OBJC_MSGSEND = YES;
154+
ENABLE_TESTABILITY = YES;
144155
GCC_C_LANGUAGE_STANDARD = gnu99;
145156
GCC_DYNAMIC_NO_PIC = NO;
157+
GCC_NO_COMMON_BLOCKS = YES;
146158
GCC_OPTIMIZATION_LEVEL = 0;
147159
GCC_PREPROCESSOR_DEFINITIONS = (
148160
"DEBUG=1",
@@ -170,19 +182,30 @@
170182
CLANG_CXX_LIBRARY = "libc++";
171183
CLANG_ENABLE_MODULES = YES;
172184
CLANG_ENABLE_OBJC_ARC = YES;
185+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
173186
CLANG_WARN_BOOL_CONVERSION = YES;
187+
CLANG_WARN_COMMA = YES;
174188
CLANG_WARN_CONSTANT_CONVERSION = YES;
189+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
175190
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
176191
CLANG_WARN_EMPTY_BODY = YES;
177192
CLANG_WARN_ENUM_CONVERSION = YES;
193+
CLANG_WARN_INFINITE_RECURSION = YES;
178194
CLANG_WARN_INT_CONVERSION = YES;
195+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
196+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
197+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
179198
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
199+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
200+
CLANG_WARN_STRICT_PROTOTYPES = YES;
201+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
180202
CLANG_WARN_UNREACHABLE_CODE = YES;
181203
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
182204
COPY_PHASE_STRIP = YES;
183205
ENABLE_NS_ASSERTIONS = NO;
184206
ENABLE_STRICT_OBJC_MSGSEND = YES;
185207
GCC_C_LANGUAGE_STANDARD = gnu99;
208+
GCC_NO_COMMON_BLOCKS = YES;
186209
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
187210
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
188211
GCC_WARN_UNDECLARED_SELECTOR = YES;

‎local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
1414
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
1515
00E356F31AD99517003FC87E /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
16+
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
1617
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
1718
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
1819
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
@@ -35,7 +36,6 @@
3536
2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
3637
2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
3738
2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
38-
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3939
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
4040
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
4141
/* End PBXBuildFile section */
@@ -359,9 +359,8 @@
359359
buildActionMask = 2147483647;
360360
files = (
361361
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
362-
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
362+
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
363363
146834051AC3E58100842450 /* libReact.a in Frameworks */,
364-
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
365364
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
366365
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
367366
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
@@ -685,7 +684,7 @@
685684
83CBB9F71A601CBA00E9B192 /* Project object */ = {
686685
isa = PBXProject;
687686
attributes = {
688-
LastUpgradeCheck = 0610;
687+
LastUpgradeCheck = 0940;
689688
ORGANIZATIONNAME = Facebook;
690689
TargetAttributes = {
691690
00E356ED1AD99517003FC87E = {
@@ -1179,6 +1178,7 @@
11791178
"-ObjC",
11801179
"-lc++",
11811180
);
1181+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
11821182
PRODUCT_NAME = "$(TARGET_NAME)";
11831183
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld.app/HelloWorld";
11841184
};
@@ -1196,6 +1196,7 @@
11961196
"-ObjC",
11971197
"-lc++",
11981198
);
1199+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
11991200
PRODUCT_NAME = "$(TARGET_NAME)";
12001201
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld.app/HelloWorld";
12011202
};
@@ -1214,6 +1215,7 @@
12141215
"-ObjC",
12151216
"-lc++",
12161217
);
1218+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
12171219
PRODUCT_NAME = HelloWorld;
12181220
VERSIONING_SYSTEM = "apple-generic";
12191221
};
@@ -1231,6 +1233,7 @@
12311233
"-ObjC",
12321234
"-lc++",
12331235
);
1236+
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
12341237
PRODUCT_NAME = HelloWorld;
12351238
VERSIONING_SYSTEM = "apple-generic";
12361239
};
@@ -1346,20 +1349,32 @@
13461349
CLANG_CXX_LIBRARY = "libc++";
13471350
CLANG_ENABLE_MODULES = YES;
13481351
CLANG_ENABLE_OBJC_ARC = YES;
1352+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13491353
CLANG_WARN_BOOL_CONVERSION = YES;
1354+
CLANG_WARN_COMMA = YES;
13501355
CLANG_WARN_CONSTANT_CONVERSION = YES;
1356+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13511357
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13521358
CLANG_WARN_EMPTY_BODY = YES;
13531359
CLANG_WARN_ENUM_CONVERSION = YES;
1360+
CLANG_WARN_INFINITE_RECURSION = YES;
13541361
CLANG_WARN_INT_CONVERSION = YES;
1362+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1363+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1364+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13551365
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1366+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1367+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1368+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13561369
CLANG_WARN_UNREACHABLE_CODE = YES;
13571370
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13581371
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
13591372
COPY_PHASE_STRIP = NO;
13601373
ENABLE_STRICT_OBJC_MSGSEND = YES;
1374+
ENABLE_TESTABILITY = YES;
13611375
GCC_C_LANGUAGE_STANDARD = gnu99;
13621376
GCC_DYNAMIC_NO_PIC = NO;
1377+
GCC_NO_COMMON_BLOCKS = YES;
13631378
GCC_OPTIMIZATION_LEVEL = 0;
13641379
GCC_PREPROCESSOR_DEFINITIONS = (
13651380
"DEBUG=1",
@@ -1387,20 +1402,31 @@
13871402
CLANG_CXX_LIBRARY = "libc++";
13881403
CLANG_ENABLE_MODULES = YES;
13891404
CLANG_ENABLE_OBJC_ARC = YES;
1405+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13901406
CLANG_WARN_BOOL_CONVERSION = YES;
1407+
CLANG_WARN_COMMA = YES;
13911408
CLANG_WARN_CONSTANT_CONVERSION = YES;
1409+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13921410
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13931411
CLANG_WARN_EMPTY_BODY = YES;
13941412
CLANG_WARN_ENUM_CONVERSION = YES;
1413+
CLANG_WARN_INFINITE_RECURSION = YES;
13951414
CLANG_WARN_INT_CONVERSION = YES;
1415+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1416+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1417+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13961418
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1419+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1420+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1421+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13971422
CLANG_WARN_UNREACHABLE_CODE = YES;
13981423
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13991424
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14001425
COPY_PHASE_STRIP = YES;
14011426
ENABLE_NS_ASSERTIONS = NO;
14021427
ENABLE_STRICT_OBJC_MSGSEND = YES;
14031428
GCC_C_LANGUAGE_STANDARD = gnu99;
1429+
GCC_NO_COMMON_BLOCKS = YES;
14041430
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
14051431
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
14061432
GCC_WARN_UNDECLARED_SELECTOR = YES;

‎local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"

‎local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0620"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"

‎local-cli/templates/HelloWorld/ios/HelloWorld/Info.plist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>$(EXECUTABLE_NAME)</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
@@ -24,6 +24,8 @@
2424
<string>1</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
27+
<key>NSLocationWhenInUseUsageDescription</key>
28+
<string></string>
2729
<key>UILaunchStoryboardName</key>
2830
<string>LaunchScreen</string>
2931
<key>UIRequiredDeviceCapabilities</key>

‎local-cli/templates/HelloWorld/ios/HelloWorldTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)