Skip to content

Commit ab52701

Browse files
authored
Merge pull request apple#671 from thomasvl/xcode9_updates
Let Xcode 9 update project settings.
2 parents 2fd4c45 + beda326 commit ab52701

File tree

5 files changed

+25
-5
lines changed

5 files changed

+25
-5
lines changed

SwiftProtobuf.xcodeproj/project.pbxproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@
12711271
isa = PBXProject;
12721272
attributes = {
12731273
LastSwiftUpdateCheck = 0800;
1274-
LastUpgradeCheck = 0830;
1274+
LastUpgradeCheck = 0900;
12751275
TargetAttributes = {
12761276
9C8CDA111D7A288E00E207CA = {
12771277
CreatedOnToolsVersion = 8.0;
@@ -2235,15 +2235,21 @@
22352235
buildSettings = {
22362236
ALWAYS_SEARCH_USER_PATHS = NO;
22372237
CLANG_ANALYZER_NONNULL = YES;
2238+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
22382239
CLANG_WARN_BOOL_CONVERSION = YES;
2240+
CLANG_WARN_COMMA = YES;
22392241
CLANG_WARN_CONSTANT_CONVERSION = YES;
22402242
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
22412243
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
22422244
CLANG_WARN_EMPTY_BODY = YES;
22432245
CLANG_WARN_ENUM_CONVERSION = YES;
22442246
CLANG_WARN_INFINITE_RECURSION = YES;
22452247
CLANG_WARN_INT_CONVERSION = YES;
2248+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2249+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
22462250
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2251+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2252+
CLANG_WARN_STRICT_PROTOTYPES = YES;
22472253
CLANG_WARN_SUSPICIOUS_MOVE = YES;
22482254
CLANG_WARN_SUSPICIOUS_MOVES = YES;
22492255
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -2282,15 +2288,21 @@
22822288
buildSettings = {
22832289
ALWAYS_SEARCH_USER_PATHS = NO;
22842290
CLANG_ANALYZER_NONNULL = YES;
2291+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
22852292
CLANG_WARN_BOOL_CONVERSION = YES;
2293+
CLANG_WARN_COMMA = YES;
22862294
CLANG_WARN_CONSTANT_CONVERSION = YES;
22872295
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
22882296
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
22892297
CLANG_WARN_EMPTY_BODY = YES;
22902298
CLANG_WARN_ENUM_CONVERSION = YES;
22912299
CLANG_WARN_INFINITE_RECURSION = YES;
22922300
CLANG_WARN_INT_CONVERSION = YES;
2301+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2302+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
22932303
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2304+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2305+
CLANG_WARN_STRICT_PROTOTYPES = YES;
22942306
CLANG_WARN_SUSPICIOUS_MOVE = YES;
22952307
CLANG_WARN_SUSPICIOUS_MOVES = YES;
22962308
CLANG_WARN_UNREACHABLE_CODE = YES;

SwiftProtobuf.xcodeproj/xcshareddata/xcschemes/SwiftProtobuf_iOS.xcscheme

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

SwiftProtobuf.xcodeproj/xcshareddata/xcschemes/SwiftProtobuf_macOS.xcscheme

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -46,6 +47,7 @@
4647
buildConfiguration = "Debug"
4748
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4849
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
50+
language = ""
4951
launchStyle = "0"
5052
useCustomWorkingDirectory = "NO"
5153
ignoresPersistentStateOnLaunch = "NO"

SwiftProtobuf.xcodeproj/xcshareddata/xcschemes/SwiftProtobuf_tvOS.xcscheme

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

SwiftProtobuf.xcodeproj/xcshareddata/xcschemes/SwiftProtobuf_watchOS.xcscheme

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)