Skip to content

Commit 9692ead

Browse files
authored
Merge pull request #242 from ikesyo/xcode-recommended-settings
[Xcode] Update to recommended settings
2 parents 8a976c8 + 5b8861b commit 9692ead

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

XCTest.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
attributes = {
280280
LastSwiftMigration = 0730;
281281
LastSwiftUpdateCheck = 0730;
282-
LastUpgradeCheck = 0900;
282+
LastUpgradeCheck = 1010;
283283
ORGANIZATIONNAME = Apple;
284284
TargetAttributes = {
285285
5B5D86DA1BBC74AD00234F36 = {
@@ -380,12 +380,14 @@
380380
CLANG_WARN_BOOL_CONVERSION = YES;
381381
CLANG_WARN_COMMA = YES;
382382
CLANG_WARN_CONSTANT_CONVERSION = YES;
383+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
383384
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
384385
CLANG_WARN_EMPTY_BODY = YES;
385386
CLANG_WARN_ENUM_CONVERSION = YES;
386387
CLANG_WARN_INFINITE_RECURSION = YES;
387388
CLANG_WARN_INT_CONVERSION = YES;
388389
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
390+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
389391
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
390392
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
391393
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -441,12 +443,14 @@
441443
CLANG_WARN_BOOL_CONVERSION = YES;
442444
CLANG_WARN_COMMA = YES;
443445
CLANG_WARN_CONSTANT_CONVERSION = YES;
446+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
444447
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
445448
CLANG_WARN_EMPTY_BODY = YES;
446449
CLANG_WARN_ENUM_CONVERSION = YES;
447450
CLANG_WARN_INFINITE_RECURSION = YES;
448451
CLANG_WARN_INT_CONVERSION = YES;
449452
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
453+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
450454
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
451455
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
452456
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

XCTest.xcodeproj/xcshareddata/xcschemes/SwiftXCTest.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -40,7 +40,6 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
4544
<Testables>
4645
</Testables>
@@ -60,7 +59,6 @@
6059
buildConfiguration = "Debug"
6160
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6261
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
63-
language = ""
6462
launchStyle = "0"
6563
useCustomWorkingDirectory = "NO"
6664
ignoresPersistentStateOnLaunch = "NO"

XCTest.xcodeproj/xcshareddata/xcschemes/SwiftXCTestFunctionalTests.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -54,7 +54,6 @@
5454
buildConfiguration = "Debug"
5555
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5656
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
57-
language = ""
5857
shouldUseLaunchSchemeArgsEnv = "YES">
5958
<Testables>
6059
</Testables>
@@ -74,7 +73,6 @@
7473
buildConfiguration = "Debug"
7574
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7675
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
77-
language = ""
7876
launchStyle = "0"
7977
useCustomWorkingDirectory = "NO"
8078
ignoresPersistentStateOnLaunch = "NO"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)