Skip to content

Commit 5845323

Browse files
moshegottliebmoshegottlieb
committed
Adapted to swift 5, so it would compile with the latest Xcode.
No other changes.
1 parent b23a01b commit 5845323

File tree

3 files changed

+50
-20
lines changed

3 files changed

+50
-20
lines changed

‎ScreenMazer.xcodeproj/project.pbxproj

+37-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
A89B9C6B2120F56000CE35AC /* DefaultsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8B6825521204AFB0086CF0F /* DefaultsManager.swift */; };
2222
A8B68248212024830086CF0F /* MazeScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8B68247212024830086CF0F /* MazeScene.swift */; };
2323
A8B6824A212029220086CF0F /* MazeGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8B68249212029220086CF0F /* MazeGenerator.swift */; };
24-
A8B6824B212047760086CF0F /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6FF6D25F1D1DBB1100F5A23C /* Info.plist */; };
2524
A8B6825321204A2E0086CF0F /* thumbnail.jpg in Resources */ = {isa = PBXBuildFile; fileRef = A8B6825121204A2E0086CF0F /* thumbnail.jpg */; };
2625
A8B6825421204A2E0086CF0F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = A8B6825221204A2E0086CF0F /* [email protected] */; };
2726
A8B6825621204AFB0086CF0F /* DefaultsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8B6825521204AFB0086CF0F /* DefaultsManager.swift */; };
@@ -181,12 +180,12 @@
181180
isa = PBXProject;
182181
attributes = {
183182
LastSwiftUpdateCheck = 0920;
184-
LastUpgradeCheck = 0820;
183+
LastUpgradeCheck = 1420;
185184
ORGANIZATIONNAME = "Beals, Alex";
186185
TargetAttributes = {
187186
6FF6D2571D1DBB1100F5A23C = {
188187
CreatedOnToolsVersion = 7.3;
189-
LastSwiftMigration = 0820;
188+
LastSwiftMigration = "";
190189
};
191190
A89B9C562120F47F00CE35AC = {
192191
CreatedOnToolsVersion = 9.2;
@@ -200,6 +199,7 @@
200199
developmentRegion = English;
201200
hasScannedForEncodings = 0;
202201
knownRegions = (
202+
English,
203203
en,
204204
Base,
205205
);
@@ -219,7 +219,6 @@
219219
isa = PBXResourcesBuildPhase;
220220
buildActionMask = 2147483647;
221221
files = (
222-
A8B6824B212047760086CF0F /* Info.plist in Resources */,
223222
A8B6825321204A2E0086CF0F /* thumbnail.jpg in Resources */,
224223
A8B6825A2120518C0086CF0F /* ConfigureSheet.xib in Resources */,
225224
A8B6825421204A2E0086CF0F /* [email protected] in Resources */,
@@ -284,24 +283,35 @@
284283
isa = XCBuildConfiguration;
285284
buildSettings = {
286285
ALWAYS_SEARCH_USER_PATHS = NO;
286+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
287287
CLANG_ANALYZER_NONNULL = YES;
288288
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
289289
CLANG_CXX_LIBRARY = "libc++";
290290
CLANG_ENABLE_MODULES = YES;
291291
CLANG_ENABLE_OBJC_ARC = YES;
292+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
292293
CLANG_WARN_BOOL_CONVERSION = YES;
294+
CLANG_WARN_COMMA = YES;
293295
CLANG_WARN_CONSTANT_CONVERSION = YES;
296+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
294297
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
295298
CLANG_WARN_EMPTY_BODY = YES;
296299
CLANG_WARN_ENUM_CONVERSION = YES;
297300
CLANG_WARN_INFINITE_RECURSION = YES;
298301
CLANG_WARN_INT_CONVERSION = YES;
302+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
303+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
304+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
299305
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
306+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
307+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
308+
CLANG_WARN_STRICT_PROTOTYPES = YES;
300309
CLANG_WARN_SUSPICIOUS_MOVE = YES;
301310
CLANG_WARN_UNREACHABLE_CODE = YES;
302311
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
303312
CODE_SIGN_IDENTITY = "-";
304313
COPY_PHASE_STRIP = NO;
314+
DEAD_CODE_STRIPPING = YES;
305315
DEBUG_INFORMATION_FORMAT = dwarf;
306316
ENABLE_STRICT_OBJC_MSGSEND = YES;
307317
ENABLE_TESTABILITY = YES;
@@ -330,24 +340,35 @@
330340
isa = XCBuildConfiguration;
331341
buildSettings = {
332342
ALWAYS_SEARCH_USER_PATHS = NO;
343+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
333344
CLANG_ANALYZER_NONNULL = YES;
334345
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
335346
CLANG_CXX_LIBRARY = "libc++";
336347
CLANG_ENABLE_MODULES = YES;
337348
CLANG_ENABLE_OBJC_ARC = YES;
349+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
338350
CLANG_WARN_BOOL_CONVERSION = YES;
351+
CLANG_WARN_COMMA = YES;
339352
CLANG_WARN_CONSTANT_CONVERSION = YES;
353+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
340354
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
341355
CLANG_WARN_EMPTY_BODY = YES;
342356
CLANG_WARN_ENUM_CONVERSION = YES;
343357
CLANG_WARN_INFINITE_RECURSION = YES;
344358
CLANG_WARN_INT_CONVERSION = YES;
359+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
360+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
361+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
345362
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
363+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
364+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
365+
CLANG_WARN_STRICT_PROTOTYPES = YES;
346366
CLANG_WARN_SUSPICIOUS_MOVE = YES;
347367
CLANG_WARN_UNREACHABLE_CODE = YES;
348368
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
349369
CODE_SIGN_IDENTITY = "-";
350370
COPY_PHASE_STRIP = NO;
371+
DEAD_CODE_STRIPPING = YES;
351372
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
352373
ENABLE_NS_ASSERTIONS = NO;
353374
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -372,14 +393,16 @@
372393
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
373394
CLANG_ENABLE_MODULES = YES;
374395
COMBINE_HIDPI_IMAGES = YES;
396+
DEAD_CODE_STRIPPING = YES;
375397
INFOPLIST_FILE = "$(SRCROOT)/ScreenMazer/Info.plist";
376398
INSTALL_PATH = "$(HOME)/Library/Screen Savers";
377399
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
400+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
378401
PRODUCT_BUNDLE_IDENTIFIER = com.alexbeals.ScreenMazer;
379402
PRODUCT_NAME = "$(TARGET_NAME)";
380403
SWIFT_OBJC_BRIDGING_HEADER = "";
381404
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
382-
SWIFT_VERSION = 3.0;
405+
SWIFT_VERSION = 5.0;
383406
WRAPPER_EXTENSION = saver;
384407
};
385408
name = Debug;
@@ -390,13 +413,15 @@
390413
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
391414
CLANG_ENABLE_MODULES = YES;
392415
COMBINE_HIDPI_IMAGES = YES;
416+
DEAD_CODE_STRIPPING = YES;
393417
INFOPLIST_FILE = "$(SRCROOT)/ScreenMazer/Info.plist";
394418
INSTALL_PATH = "$(HOME)/Library/Screen Savers";
395419
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
420+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
396421
PRODUCT_BUNDLE_IDENTIFIER = com.alexbeals.ScreenMazer;
397422
PRODUCT_NAME = "$(TARGET_NAME)";
398423
SWIFT_OBJC_BRIDGING_HEADER = "";
399-
SWIFT_VERSION = 3.0;
424+
SWIFT_VERSION = 5.0;
400425
WRAPPER_EXTENSION = saver;
401426
};
402427
name = Release;
@@ -419,11 +444,13 @@
419444
CODE_SIGN_IDENTITY = "Mac Developer";
420445
CODE_SIGN_STYLE = Automatic;
421446
COMBINE_HIDPI_IMAGES = YES;
447+
DEAD_CODE_STRIPPING = YES;
422448
DEVELOPMENT_TEAM = K2WR3HLA57;
449+
ENABLE_HARDENED_RUNTIME = YES;
423450
GCC_C_LANGUAGE_STANDARD = gnu11;
424451
INFOPLIST_FILE = TestApp/Info.plist;
425452
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
426-
MACOSX_DEPLOYMENT_TARGET = 10.13;
453+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
427454
PRODUCT_BUNDLE_IDENTIFIER = com.alexbeals.TestApp;
428455
PRODUCT_NAME = "$(TARGET_NAME)";
429456
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -450,11 +477,13 @@
450477
CODE_SIGN_IDENTITY = "Mac Developer";
451478
CODE_SIGN_STYLE = Automatic;
452479
COMBINE_HIDPI_IMAGES = YES;
480+
DEAD_CODE_STRIPPING = YES;
453481
DEVELOPMENT_TEAM = K2WR3HLA57;
482+
ENABLE_HARDENED_RUNTIME = YES;
454483
GCC_C_LANGUAGE_STANDARD = gnu11;
455484
INFOPLIST_FILE = TestApp/Info.plist;
456485
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
457-
MACOSX_DEPLOYMENT_TARGET = 10.13;
486+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
458487
PRODUCT_BUNDLE_IDENTIFIER = com.alexbeals.TestApp;
459488
PRODUCT_NAME = "$(TARGET_NAME)";
460489
SWIFT_VERSION = 4.0;

‎ScreenMazer/ConfigureSheetController.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ class ConfigureSheetController : NSObject {
2525
override init() {
2626
super.init()
2727
let myBundle = Bundle(for: ConfigureSheetController.self)
28-
myBundle.loadNibNamed("ConfigureSheet", owner: self, topLevelObjects: nil)
28+
myBundle.loadNibNamed(NSNib.Name("ConfigureSheet"), owner: self, topLevelObjects: nil)
2929
canvasColorWell!.color = defaultsManager.color
3030
solveColorWell.color = defaultsManager.solveColor
3131
duration.stringValue = String(defaultsManager.duration)
3232
solveDuration.stringValue = String(defaultsManager.solveDuration)
3333
mazeSize.doubleValue = Double(defaultsManager.mazeSize)
3434
clockSize.doubleValue = Double(defaultsManager.clockSize)
35-
hourClock.state = defaultsManager.hourClock ? NSControlStateValueOn : NSControlStateValueOff
36-
solveCheck.state = defaultsManager.solve ? NSControlStateValueOn : NSControlStateValueOff
35+
hourClock.state = defaultsManager.hourClock ? .on : .off
36+
solveCheck.state = defaultsManager.solve ? .on : .off
3737
}
3838

3939
@IBAction func colorFinished(_ sender: Any) {
@@ -68,18 +68,18 @@ class ConfigureSheetController : NSObject {
6868
}
6969

7070
@IBAction func clockFinished(_ sender: Any) {
71-
defaultsManager.hourClock = (hourClock.state == NSControlStateValueOn)
71+
defaultsManager.hourClock = (hourClock.state == .on)
7272
callback?()
7373
}
7474

7575
@IBAction func solveFinished(_ sender: Any) {
76-
defaultsManager.solve = (solveCheck.state == NSControlStateValueOn)
76+
defaultsManager.solve = (solveCheck.state == .on)
7777
callback?()
7878
}
7979

80-
@IBAction func closeConfigureSheet(_ sender: AnyObject) {
81-
NSColorPanel.shared().close()
82-
window?.sheetParent!.endSheet(window!, returnCode: (sender.tag == 1) ? NSModalResponseOK : NSModalResponseCancel)
80+
@IBAction func closeConfigureSheet(_ sender: AnyObject) {
81+
NSColorPanel.shared.close()
82+
window?.sheetParent!.endSheet(window!, returnCode: (sender.tag == 1) ? .OK : .cancel)
8383
}
8484
}
8585

‎ScreenMazer/swiftSS.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ class swiftSS: ScreenSaverView {
3535
//add it in as a subview
3636
self.addSubview(view)
3737
}
38-
39-
override func hasConfigureSheet() -> Bool {
38+
39+
override var hasConfigureSheet: Bool {
4040
return true
4141
}
4242

43-
override func configureSheet() -> NSWindow? {
44-
sheetController.callback = { _ in
43+
override var configureSheet: NSWindow? {
44+
45+
sheetController.callback = {
4546
if ((self.mazeScene) != nil) {
4647
// Re-trigger the setup for the maze
4748
self.mazeScene?.generateMaze()

0 commit comments

Comments
 (0)