Skip to content

Commit 47a72d6

Browse files
cwakamocwakamo
committed
Performed Xcode project modernizations using Xcode 13.4.
1 parent dd0d8c8 commit 47a72d6

15 files changed

+105
-126
lines changed

Diff for: ‎PlaygroundLogger/PlaygroundLogger.xcodeproj/project.pbxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@
813813
isa = PBXProject;
814814
attributes = {
815815
LastSwiftUpdateCheck = 1000;
816-
LastUpgradeCheck = 1130;
816+
LastUpgradeCheck = 1340;
817817
ORGANIZATIONNAME = "Apple Inc. and the Swift project authors";
818818
TargetAttributes = {
819819
5E2646261FB64876002DC6B6 = {
@@ -1153,6 +1153,7 @@
11531153
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11541154
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11551155
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1156+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
11561157
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
11571158
CLANG_WARN_STRICT_PROTOTYPES = YES;
11581159
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1208,6 +1209,7 @@
12081209
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12091210
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12101211
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1212+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
12111213
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
12121214
CLANG_WARN_STRICT_PROTOTYPES = YES;
12131215
CLANG_WARN_SUSPICIOUS_MOVE = YES;

Diff for: ‎PlaygroundLogger/PlaygroundLogger.xcodeproj/xcshareddata/xcschemes/PlaygroundLogger (iOS).xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1340"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Diff for: ‎PlaygroundLogger/PlaygroundLogger.xcodeproj/xcshareddata/xcschemes/PlaygroundLogger (macOS).xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1340"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Diff for: ‎PlaygroundLogger/PlaygroundLogger.xcodeproj/xcshareddata/xcschemes/PlaygroundLogger (tvOS).xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1340"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Diff for: ‎PlaygroundSupport/PlaygroundSupport.xcodeproj/project.pbxproj

+29-3
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@
814814
attributes = {
815815
LastSwiftMigration = 0800;
816816
LastSwiftUpdateCheck = 0730;
817-
LastUpgradeCheck = 0910;
817+
LastUpgradeCheck = 1340;
818818
ORGANIZATIONNAME = "Apple Inc.";
819819
TargetAttributes = {
820820
1DF4116118DCB596001CDFC7 = {
@@ -873,11 +873,11 @@
873873
};
874874
buildConfigurationList = 1D7FD51518BFE00400C718C6 /* Build configuration list for PBXProject "PlaygroundSupport" */;
875875
compatibilityVersion = "Xcode 3.2";
876-
developmentRegion = English;
876+
developmentRegion = en;
877877
hasScannedForEncodings = 0;
878878
knownRegions = (
879-
English,
880879
en,
880+
Base,
881881
);
882882
mainGroup = 1D7FD51118BFE00400C718C6;
883883
productRefGroup = 1D7FD51B18BFE00400C718C6 /* Products */;
@@ -1267,16 +1267,20 @@
12671267
isa = XCBuildConfiguration;
12681268
baseConfigurationReference = 5E6C2B461FE9DCD000DEE489 /* Debug.xcconfig */;
12691269
buildSettings = {
1270+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
12701271
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
12711272
CLANG_WARN_BOOL_CONVERSION = YES;
12721273
CLANG_WARN_COMMA = YES;
12731274
CLANG_WARN_CONSTANT_CONVERSION = YES;
1275+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
12741276
CLANG_WARN_EMPTY_BODY = YES;
12751277
CLANG_WARN_ENUM_CONVERSION = YES;
12761278
CLANG_WARN_INFINITE_RECURSION = YES;
12771279
CLANG_WARN_INT_CONVERSION = YES;
12781280
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1281+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12791282
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1283+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
12801284
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
12811285
CLANG_WARN_STRICT_PROTOTYPES = YES;
12821286
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1299,16 +1303,20 @@
12991303
isa = XCBuildConfiguration;
13001304
baseConfigurationReference = 5E6C2B471FE9DCDD00DEE489 /* Release.xcconfig */;
13011305
buildSettings = {
1306+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
13021307
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13031308
CLANG_WARN_BOOL_CONVERSION = YES;
13041309
CLANG_WARN_COMMA = YES;
13051310
CLANG_WARN_CONSTANT_CONVERSION = YES;
1311+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13061312
CLANG_WARN_EMPTY_BODY = YES;
13071313
CLANG_WARN_ENUM_CONVERSION = YES;
13081314
CLANG_WARN_INFINITE_RECURSION = YES;
13091315
CLANG_WARN_INT_CONVERSION = YES;
13101316
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1317+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
13111318
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1319+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
13121320
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
13131321
CLANG_WARN_STRICT_PROTOTYPES = YES;
13141322
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1333,6 +1341,7 @@
13331341
isa = XCBuildConfiguration;
13341342
buildSettings = {
13351343
ALWAYS_SEARCH_USER_PATHS = NO;
1344+
CLANG_ENABLE_OBJC_WEAK = YES;
13361345
DYLIB_COMPATIBILITY_VERSION = 1;
13371346
DYLIB_CURRENT_VERSION = 1;
13381347
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1353,6 +1362,7 @@
13531362
isa = XCBuildConfiguration;
13541363
buildSettings = {
13551364
ALWAYS_SEARCH_USER_PATHS = NO;
1365+
CLANG_ENABLE_OBJC_WEAK = YES;
13561366
DYLIB_COMPATIBILITY_VERSION = 1;
13571367
DYLIB_CURRENT_VERSION = 1;
13581368
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1372,13 +1382,15 @@
13721382
5E36505B1B56D83400205D2D /* Debug */ = {
13731383
isa = XCBuildConfiguration;
13741384
buildSettings = {
1385+
CLANG_ENABLE_OBJC_WEAK = YES;
13751386
PRODUCT_NAME = "$(TARGET_NAME)";
13761387
};
13771388
name = Debug;
13781389
};
13791390
5E36505C1B56D83400205D2D /* Release */ = {
13801391
isa = XCBuildConfiguration;
13811392
buildSettings = {
1393+
CLANG_ENABLE_OBJC_WEAK = YES;
13821394
PRODUCT_NAME = "$(TARGET_NAME)";
13831395
};
13841396
name = Release;
@@ -1475,27 +1487,31 @@
14751487
94182A0C1D25D5F5002CCB9E /* Debug */ = {
14761488
isa = XCBuildConfiguration;
14771489
buildSettings = {
1490+
CLANG_ENABLE_OBJC_WEAK = YES;
14781491
PRODUCT_NAME = "$(TARGET_NAME)";
14791492
};
14801493
name = Debug;
14811494
};
14821495
94182A0D1D25D5F5002CCB9E /* Release */ = {
14831496
isa = XCBuildConfiguration;
14841497
buildSettings = {
1498+
CLANG_ENABLE_OBJC_WEAK = YES;
14851499
PRODUCT_NAME = "$(TARGET_NAME)";
14861500
};
14871501
name = Release;
14881502
};
14891503
A80607191CCEAD2500E951C8 /* Debug */ = {
14901504
isa = XCBuildConfiguration;
14911505
buildSettings = {
1506+
CLANG_ENABLE_OBJC_WEAK = YES;
14921507
PRODUCT_NAME = "$(TARGET_NAME)";
14931508
};
14941509
name = Debug;
14951510
};
14961511
A806071A1CCEAD2500E951C8 /* Release */ = {
14971512
isa = XCBuildConfiguration;
14981513
buildSettings = {
1514+
CLANG_ENABLE_OBJC_WEAK = YES;
14991515
PRODUCT_NAME = "$(TARGET_NAME)";
15001516
};
15011517
name = Release;
@@ -1504,6 +1520,7 @@
15041520
isa = XCBuildConfiguration;
15051521
buildSettings = {
15061522
ALWAYS_SEARCH_USER_PATHS = NO;
1523+
CLANG_ENABLE_OBJC_WEAK = YES;
15071524
DEFINES_MODULE = YES;
15081525
DYLIB_COMPATIBILITY_VERSION = 1;
15091526
DYLIB_CURRENT_VERSION = 1;
@@ -1525,6 +1542,7 @@
15251542
isa = XCBuildConfiguration;
15261543
buildSettings = {
15271544
ALWAYS_SEARCH_USER_PATHS = NO;
1545+
CLANG_ENABLE_OBJC_WEAK = YES;
15281546
DEFINES_MODULE = YES;
15291547
DYLIB_COMPATIBILITY_VERSION = 1;
15301548
DYLIB_CURRENT_VERSION = 1;
@@ -1727,13 +1745,15 @@
17271745
A8318FCE1CF604540015809A /* Debug */ = {
17281746
isa = XCBuildConfiguration;
17291747
buildSettings = {
1748+
CLANG_ENABLE_OBJC_WEAK = YES;
17301749
PRODUCT_NAME = "$(TARGET_NAME)";
17311750
};
17321751
name = Debug;
17331752
};
17341753
A8318FCF1CF604540015809A /* Release */ = {
17351754
isa = XCBuildConfiguration;
17361755
buildSettings = {
1756+
CLANG_ENABLE_OBJC_WEAK = YES;
17371757
PRODUCT_NAME = "$(TARGET_NAME)";
17381758
};
17391759
name = Release;
@@ -2302,41 +2322,47 @@
23022322
A8FC12DD1CF62B6B005BE06F /* Debug */ = {
23032323
isa = XCBuildConfiguration;
23042324
buildSettings = {
2325+
CLANG_ENABLE_OBJC_WEAK = YES;
23052326
PRODUCT_NAME = "$(TARGET_NAME)";
23062327
};
23072328
name = Debug;
23082329
};
23092330
A8FC12DE1CF62B6B005BE06F /* Release */ = {
23102331
isa = XCBuildConfiguration;
23112332
buildSettings = {
2333+
CLANG_ENABLE_OBJC_WEAK = YES;
23122334
PRODUCT_NAME = "$(TARGET_NAME)";
23132335
};
23142336
name = Release;
23152337
};
23162338
A8FC12E71CF62B99005BE06F /* Debug */ = {
23172339
isa = XCBuildConfiguration;
23182340
buildSettings = {
2341+
CLANG_ENABLE_OBJC_WEAK = YES;
23192342
PRODUCT_NAME = "$(TARGET_NAME)";
23202343
};
23212344
name = Debug;
23222345
};
23232346
A8FC12E81CF62B99005BE06F /* Release */ = {
23242347
isa = XCBuildConfiguration;
23252348
buildSettings = {
2349+
CLANG_ENABLE_OBJC_WEAK = YES;
23262350
PRODUCT_NAME = "$(TARGET_NAME)";
23272351
};
23282352
name = Release;
23292353
};
23302354
A8FC12F11CF62BA0005BE06F /* Debug */ = {
23312355
isa = XCBuildConfiguration;
23322356
buildSettings = {
2357+
CLANG_ENABLE_OBJC_WEAK = YES;
23332358
PRODUCT_NAME = "$(TARGET_NAME)";
23342359
};
23352360
name = Debug;
23362361
};
23372362
A8FC12F21CF62BA0005BE06F /* Release */ = {
23382363
isa = XCBuildConfiguration;
23392364
buildSettings = {
2365+
CLANG_ENABLE_OBJC_WEAK = YES;
23402366
PRODUCT_NAME = "$(TARGET_NAME)";
23412367
};
23422368
name = Release;

Diff for: ‎PlaygroundSupport/PlaygroundSupport.xcodeproj/xcshareddata/xcschemes/PlaygroundSupport (iOS).xcscheme

+10-14
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 = "1340"
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 = "A8318FA21CF6036E0015809A"
34+
BuildableName = "PlaygroundSupport.framework"
35+
BlueprintName = "PlaygroundSupport_iOS"
36+
ReferencedContainer = "container:PlaygroundSupport.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 = "A8318FA21CF6036E0015809A"
46-
BuildableName = "PlaygroundSupport.framework"
47-
BlueprintName = "PlaygroundSupport_iOS"
48-
ReferencedContainer = "container:PlaygroundSupport.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:PlaygroundSupport.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

Diff for: ‎PlaygroundSupport/PlaygroundSupport.xcodeproj/xcshareddata/xcschemes/PlaygroundSupport (macOS).xcscheme

+10-14
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 = "1340"
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 = "A8318F8F1CF603630015809A"
34+
BuildableName = "PlaygroundSupport.framework"
35+
BlueprintName = "PlaygroundSupport_OSX"
36+
ReferencedContainer = "container:PlaygroundSupport.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 = "A8318F8F1CF603630015809A"
46-
BuildableName = "PlaygroundSupport.framework"
47-
BlueprintName = "PlaygroundSupport_OSX"
48-
ReferencedContainer = "container:PlaygroundSupport.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:PlaygroundSupport.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

0 commit comments

Comments
 (0)