1
1
mirror of https://github.com/danbee/persephone synced 2025-03-04 08:39:11 +00:00

Upgrade to Swift 4.2

This commit is contained in:
Daniel Barber 2019-02-13 21:24:01 -05:00
parent ffedba5c84
commit a30c6ffc09
Signed by: danbarber
GPG Key ID: 931D8112E0103DD8
3 changed files with 13 additions and 10 deletions

View File

@ -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;

View File

@ -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

View File

@ -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()