Skip to content

Commit 9085f0a

Browse files
kristopherjohnsonkristopherjohnson
authored
Merge pull request #3 from kristopherjohnson/swift5
Update for Swift 5, Xcode 11, and Catalina
2 parents d6d34d7 + 0ad2417 commit 9085f0a

14 files changed

+212
-171
lines changed

‎MenubarCountdown.xcodeproj/project.pbxproj

+37-10
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
4EB204351BED89F900D83EF3 /* MenubarCountdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB204341BED89F900D83EF3 /* MenubarCountdownTests.swift */; };
3030
4EB204401BED89F900D83EF3 /* MenubarCountdownUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB2043F1BED89F900D83EF3 /* MenubarCountdownUITests.swift */; };
3131
4EB2044E1BED908300D83EF3 /* Stopwatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB2044D1BED908300D83EF3 /* Stopwatch.swift */; };
32-
4EB204501BEE29D700D83EF3 /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB2044F1BEE29D700D83EF3 /* UserDefaults.swift */; };
32+
4EB204501BEE29D700D83EF3 /* AppUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB2044F1BEE29D700D83EF3 /* AppUserDefaults.swift */; };
3333
4EB204521BEE2E8B00D83EF3 /* StatusItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB204511BEE2E8B00D83EF3 /* StatusItemView.swift */; };
3434
4EB204541BEE307900D83EF3 /* CALayerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB204531BEE307900D83EF3 /* CALayerExtensions.swift */; };
3535
/* End PBXBuildFile section */
@@ -82,7 +82,7 @@
8282
4EB2043F1BED89F900D83EF3 /* MenubarCountdownUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenubarCountdownUITests.swift; sourceTree = "<group>"; };
8383
4EB204411BED89F900D83EF3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8484
4EB2044D1BED908300D83EF3 /* Stopwatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stopwatch.swift; sourceTree = "<group>"; };
85-
4EB2044F1BEE29D700D83EF3 /* UserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaults.swift; sourceTree = "<group>"; };
85+
4EB2044F1BEE29D700D83EF3 /* AppUserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppUserDefaults.swift; sourceTree = "<group>"; };
8686
4EB204511BEE2E8B00D83EF3 /* StatusItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusItemView.swift; sourceTree = "<group>"; };
8787
4EB204531BEE307900D83EF3 /* CALayerExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CALayerExtensions.swift; sourceTree = "<group>"; };
8888
/* End PBXFileReference section */
@@ -191,7 +191,7 @@
191191
4E4865991BEE79EA00C159BF /* TextField.swift */,
192192
4E4865B21BEFC63700C159BF /* TimerExpiredAlert.xib */,
193193
4E48659B1BEE81C200C159BF /* TimerExpiredAlertController.swift */,
194-
4EB2044F1BEE29D700D83EF3 /* UserDefaults.swift */,
194+
4EB2044F1BEE29D700D83EF3 /* AppUserDefaults.swift */,
195195
4EB204241BED89F900D83EF3 /* ViewController.swift */,
196196
);
197197
path = MenubarCountdown;
@@ -278,7 +278,7 @@
278278
isa = PBXProject;
279279
attributes = {
280280
LastSwiftUpdateCheck = 0710;
281-
LastUpgradeCheck = 0710;
281+
LastUpgradeCheck = 1110;
282282
ORGANIZATIONNAME = "Kristopher Johnson";
283283
TargetAttributes = {
284284
4EB2041E1BED89F900D83EF3 = {
@@ -297,7 +297,7 @@
297297
};
298298
buildConfigurationList = 4EB2041A1BED89F900D83EF3 /* Build configuration list for PBXProject "MenubarCountdown" */;
299299
compatibilityVersion = "Xcode 3.2";
300-
developmentRegion = English;
300+
developmentRegion = en;
301301
hasScannedForEncodings = 0;
302302
knownRegions = (
303303
en,
@@ -357,7 +357,7 @@
357357
4E4865981BEE749E00C159BF /* StartTimerDialogController.swift in Sources */,
358358
4EB204541BEE307900D83EF3 /* CALayerExtensions.swift in Sources */,
359359
4E48659A1BEE79EA00C159BF /* TextField.swift in Sources */,
360-
4EB204501BEE29D700D83EF3 /* UserDefaults.swift in Sources */,
360+
4EB204501BEE29D700D83EF3 /* AppUserDefaults.swift in Sources */,
361361
4EB204251BED89F900D83EF3 /* ViewController.swift in Sources */,
362362
4E4865A11BEE880A00C159BF /* DTrace.m in Sources */,
363363
4E4865961BEE721C00C159BF /* CATransactionExtensions.swift in Sources */,
@@ -406,17 +406,28 @@
406406
isa = XCBuildConfiguration;
407407
buildSettings = {
408408
ALWAYS_SEARCH_USER_PATHS = NO;
409+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
409410
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
410411
CLANG_CXX_LIBRARY = "libc++";
411412
CLANG_ENABLE_MODULES = YES;
412413
CLANG_ENABLE_OBJC_ARC = YES;
414+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
413415
CLANG_WARN_BOOL_CONVERSION = YES;
416+
CLANG_WARN_COMMA = YES;
414417
CLANG_WARN_CONSTANT_CONVERSION = YES;
418+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
415419
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
416420
CLANG_WARN_EMPTY_BODY = YES;
417421
CLANG_WARN_ENUM_CONVERSION = YES;
422+
CLANG_WARN_INFINITE_RECURSION = YES;
418423
CLANG_WARN_INT_CONVERSION = YES;
424+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
425+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
426+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
419427
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
428+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
429+
CLANG_WARN_STRICT_PROTOTYPES = YES;
430+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
420431
CLANG_WARN_UNREACHABLE_CODE = YES;
421432
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
422433
CODE_SIGN_IDENTITY = "-";
@@ -438,30 +449,42 @@
438449
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
439450
GCC_WARN_UNUSED_FUNCTION = YES;
440451
GCC_WARN_UNUSED_VARIABLE = YES;
441-
MACOSX_DEPLOYMENT_TARGET = 10.10;
452+
MACOSX_DEPLOYMENT_TARGET = 10.14;
442453
MTL_ENABLE_DEBUG_INFO = YES;
443454
ONLY_ACTIVE_ARCH = YES;
444455
OTHER_SWIFT_FLAGS = "-DDEBUG";
445456
SDKROOT = macosx;
446457
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
458+
SWIFT_VERSION = 5.0;
447459
};
448460
name = Debug;
449461
};
450462
4EB204431BED89F900D83EF3 /* Release */ = {
451463
isa = XCBuildConfiguration;
452464
buildSettings = {
453465
ALWAYS_SEARCH_USER_PATHS = NO;
466+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
454467
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
455468
CLANG_CXX_LIBRARY = "libc++";
456469
CLANG_ENABLE_MODULES = YES;
457470
CLANG_ENABLE_OBJC_ARC = YES;
471+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
458472
CLANG_WARN_BOOL_CONVERSION = YES;
473+
CLANG_WARN_COMMA = YES;
459474
CLANG_WARN_CONSTANT_CONVERSION = YES;
475+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
460476
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
461477
CLANG_WARN_EMPTY_BODY = YES;
462478
CLANG_WARN_ENUM_CONVERSION = YES;
479+
CLANG_WARN_INFINITE_RECURSION = YES;
463480
CLANG_WARN_INT_CONVERSION = YES;
481+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
482+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
483+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
464484
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
485+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
486+
CLANG_WARN_STRICT_PROTOTYPES = YES;
487+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
465488
CLANG_WARN_UNREACHABLE_CODE = YES;
466489
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
467490
CODE_SIGN_IDENTITY = "-";
@@ -477,18 +500,21 @@
477500
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
478501
GCC_WARN_UNUSED_FUNCTION = YES;
479502
GCC_WARN_UNUSED_VARIABLE = YES;
480-
MACOSX_DEPLOYMENT_TARGET = 10.10;
503+
MACOSX_DEPLOYMENT_TARGET = 10.14;
481504
MTL_ENABLE_DEBUG_INFO = NO;
482505
SDKROOT = macosx;
506+
SWIFT_COMPILATION_MODE = wholemodule;
507+
SWIFT_VERSION = 5.0;
483508
};
484509
name = Release;
485510
};
486511
4EB204451BED89F900D83EF3 /* Debug */ = {
487512
isa = XCBuildConfiguration;
488513
buildSettings = {
489514
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
490-
CODE_SIGN_IDENTITY = "Developer ID Application";
515+
CODE_SIGN_IDENTITY = "Apple Development";
491516
COMBINE_HIDPI_IMAGES = YES;
517+
ENABLE_HARDENED_RUNTIME = YES;
492518
INFOPLIST_FILE = MenubarCountdown/Info.plist;
493519
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
494520
PRODUCT_BUNDLE_IDENTIFIER = net.kristopherjohnson.MenubarCountdown;
@@ -501,8 +527,9 @@
501527
isa = XCBuildConfiguration;
502528
buildSettings = {
503529
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
504-
CODE_SIGN_IDENTITY = "Developer ID Application";
530+
CODE_SIGN_IDENTITY = "Apple Development";
505531
COMBINE_HIDPI_IMAGES = YES;
532+
ENABLE_HARDENED_RUNTIME = YES;
506533
INFOPLIST_FILE = MenubarCountdown/Info.plist;
507534
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
508535
PRODUCT_BUNDLE_IDENTIFIER = net.kristopherjohnson.MenubarCountdown;

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

+8
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>

‎MenubarCountdown.xcodeproj/xcshareddata/xcschemes/MenubarCountdown.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 = "0710"
3+
LastUpgradeVersion = "1110"
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 = "4EB2041E1BED89F900D83EF3"
34+
BuildableName = "MenubarCountdown.app"
35+
BlueprintName = "MenubarCountdown"
36+
ReferencedContainer = "container:MenubarCountdown.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "4EB2041E1BED89F900D83EF3"
56-
BuildableName = "MenubarCountdown.app"
57-
BlueprintName = "MenubarCountdown"
58-
ReferencedContainer = "container:MenubarCountdown.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
8179
ReferencedContainer = "container:MenubarCountdown.xcodeproj">
8280
</BuildableReference>
8381
</BuildableProductRunnable>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8682
</LaunchAction>
8783
<ProfileAction
8884
buildConfiguration = "Release"

0 commit comments

Comments
 (0)