Skip to content

Commit 5b3a9c7

Browse files
cwakamocwakamo
committed
[PlaygroundLogger] Adopted Xcode 11.3's project modernizations.
As part of this, updated Release.xcconfig to enable whole-module optimization the "new" way (from several Xcode releases prior). This addresses <rdar://problem/59412597>.
1 parent 50d96fe commit 5b3a9c7

File tree

6 files changed

+45
-44
lines changed

6 files changed

+45
-44
lines changed

‎PlaygroundLogger/PlaygroundLogger.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@
813813
isa = PBXProject;
814814
attributes = {
815815
LastSwiftUpdateCheck = 1000;
816-
LastUpgradeCheck = 0910;
816+
LastUpgradeCheck = 1130;
817817
ORGANIZATIONNAME = "Apple Inc. and the Swift project authors";
818818
TargetAttributes = {
819819
5E2646261FB64876002DC6B6 = {
@@ -1142,13 +1142,15 @@
11421142
CLANG_WARN_BOOL_CONVERSION = YES;
11431143
CLANG_WARN_COMMA = YES;
11441144
CLANG_WARN_CONSTANT_CONVERSION = YES;
1145+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
11451146
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
11461147
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
11471148
CLANG_WARN_EMPTY_BODY = YES;
11481149
CLANG_WARN_ENUM_CONVERSION = YES;
11491150
CLANG_WARN_INFINITE_RECURSION = YES;
11501151
CLANG_WARN_INT_CONVERSION = YES;
11511152
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1153+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11521154
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11531155
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
11541156
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1195,13 +1197,15 @@
11951197
CLANG_WARN_BOOL_CONVERSION = YES;
11961198
CLANG_WARN_COMMA = YES;
11971199
CLANG_WARN_CONSTANT_CONVERSION = YES;
1200+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
11981201
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
11991202
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
12001203
CLANG_WARN_EMPTY_BODY = YES;
12011204
CLANG_WARN_ENUM_CONVERSION = YES;
12021205
CLANG_WARN_INFINITE_RECURSION = YES;
12031206
CLANG_WARN_INT_CONVERSION = YES;
12041207
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1208+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12051209
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12061210
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
12071211
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎PlaygroundLogger/PlaygroundLogger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

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>

‎PlaygroundLogger/PlaygroundLogger.xcodeproj/xcshareddata/xcschemes/PlaygroundLogger (iOS).xcscheme

Lines changed: 10 additions & 14 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 = "0930"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "5E2646261FB64876002DC6B6"
34+
BuildableName = "PlaygroundLogger.framework"
35+
BlueprintName = "PlaygroundLogger"
36+
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "5E2646261FB64876002DC6B6"
46-
BuildableName = "PlaygroundLogger.framework"
47-
BlueprintName = "PlaygroundLogger"
48-
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎PlaygroundLogger/PlaygroundLogger.xcodeproj/xcshareddata/xcschemes/PlaygroundLogger (macOS).xcscheme

Lines changed: 10 additions & 14 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 = "0910"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "5E2646261FB64876002DC6B6"
34+
BuildableName = "PlaygroundLogger.framework"
35+
BlueprintName = "PlaygroundLogger"
36+
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "5E2646261FB64876002DC6B6"
46-
BuildableName = "PlaygroundLogger.framework"
47-
BlueprintName = "PlaygroundLogger"
48-
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎PlaygroundLogger/PlaygroundLogger.xcodeproj/xcshareddata/xcschemes/PlaygroundLogger (tvOS).xcscheme

Lines changed: 10 additions & 14 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 = "0930"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "5E2646261FB64876002DC6B6"
34+
BuildableName = "PlaygroundLogger.framework"
35+
BlueprintName = "PlaygroundLogger"
36+
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "5E2646261FB64876002DC6B6"
46-
BuildableName = "PlaygroundLogger.framework"
47-
BlueprintName = "PlaygroundLogger"
48-
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:PlaygroundLogger.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎XcodeConfig/Release.xcconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#include "Common.xcconfig"
1414

1515
// Compile Swift code at -O with WMO enabled in Release.
16-
SWIFT_OPTIMIZATION_LEVEL = -Owholemodule
16+
SWIFT_OPTIMIZATION_LEVEL = -O
17+
SWIFT_COMPILATION_MODE = wholemodule
1718

1819
// Compile C/Objective-C/C++ code at -Os in Release.
1920
GCC_OPTIMIZATION_LEVEL = s

0 commit comments

Comments
 (0)