From a30c6ffc091685cdc0fd80808a22a9848fe4f52e Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Wed, 13 Feb 2019 21:24:01 -0500 Subject: [PATCH] Upgrade to Swift 4.2 --- Persephone.xcodeproj/project.pbxproj | 15 +++++++++------ Persephone/Controllers/QueueViewController.swift | 4 ++-- Persephone/Controllers/WindowController.swift | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj index 3750e0e..879653d 100644 --- a/Persephone.xcodeproj/project.pbxproj +++ b/Persephone.xcodeproj/project.pbxproj @@ -417,6 +417,7 @@ TargetAttributes = { E40786172110CE6E006887B1 = { CreatedOnToolsVersion = 9.4.1; + LastSwiftMigration = 1010; SystemCapabilities = { com.apple.Sandbox = { enabled = 0; @@ -425,10 +426,12 @@ }; E40786292110CE70006887B1 = { CreatedOnToolsVersion = 9.4.1; + LastSwiftMigration = 1010; TestTargetID = E40786172110CE6E006887B1; }; E40786342110CE70006887B1 = { CreatedOnToolsVersion = 9.4.1; + LastSwiftMigration = 1010; TestTargetID = E40786172110CE6E006887B1; }; }; @@ -681,7 +684,7 @@ PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; USER_HEADER_SEARCH_PATHS = libmpdclient/output; }; @@ -708,7 +711,7 @@ PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; USER_HEADER_SEARCH_PATHS = libmpdclient/output; }; @@ -736,7 +739,7 @@ PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneTests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Persephone.app/Contents/MacOS/Persephone"; USER_HEADER_SEARCH_PATHS = libmpdclient/output; @@ -765,7 +768,7 @@ PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneTests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; SYSTEM_HEADER_SEARCH_PATHS = Persephone/include; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Persephone.app/Contents/MacOS/Persephone"; USER_HEADER_SEARCH_PATHS = libmpdclient/output; @@ -789,7 +792,7 @@ PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_TARGET_NAME = Persephone; }; name = Debug; @@ -811,7 +814,7 @@ PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.PersephoneUITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_TARGET_NAME = Persephone; }; name = Release; diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift index b36ecbe..4f9cb20 100644 --- a/Persephone/Controllers/QueueViewController.swift +++ b/Persephone/Controllers/QueueViewController.swift @@ -17,8 +17,8 @@ class QueueViewController: NSViewController, NSOutlineViewDataSource, NSOutlineV let systemFontRegular = NSFont.systemFont(ofSize: 13, weight: .regular) let systemFontBold = NSFont.systemFont(ofSize: 13, weight: .bold) - let playIcon = NSImage(named: NSImage.Name("playButton")) - let pauseIcon = NSImage(named: NSImage.Name("pauseButton")) + let playIcon = NSImage(named: "playButton") + let pauseIcon = NSImage(named: "pauseButton") struct SongItem { var song: MPDClient.Song diff --git a/Persephone/Controllers/WindowController.swift b/Persephone/Controllers/WindowController.swift index 6ec5816..e95e853 100644 --- a/Persephone/Controllers/WindowController.swift +++ b/Persephone/Controllers/WindowController.swift @@ -13,8 +13,8 @@ class WindowController: NSWindowController { case prevTrack, playPause, stop, nextTrack } - let playIcon = NSImage(named: NSImage.Name("playButton")) - let pauseIcon = NSImage(named: NSImage.Name("pauseButton")) + let playIcon = NSImage(named: "playButton") + let pauseIcon = NSImage(named: "pauseButton") override func windowDidLoad() { super.windowDidLoad()