diff --git a/MonitorControl.xcodeproj/project.pbxproj b/MonitorControl.xcodeproj/project.pbxproj index 69312bd..2be1910 100644 --- a/MonitorControl.xcodeproj/project.pbxproj +++ b/MonitorControl.xcodeproj/project.pbxproj @@ -287,12 +287,13 @@ 56754EAA1D9A4016007BCDC5 = { CreatedOnToolsVersion = 8.0; DevelopmentTeam = CYC8C8R4K9; - LastSwiftMigration = 0900; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; }; F06792E6200A73460066C438 = { CreatedOnToolsVersion = 9.2; DevelopmentTeam = CYC8C8R4K9; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; }; }; @@ -518,7 +519,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -572,7 +573,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -590,11 +591,12 @@ DEVELOPMENT_TEAM = CYC8C8R4K9; INFOPLIST_FILE = "$(SRCROOT)/MonitorControl/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = me.guillaumeb.MonitorControl; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "MonitorControl/Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -609,11 +611,12 @@ DEVELOPMENT_TEAM = CYC8C8R4K9; INFOPLIST_FILE = "$(SRCROOT)/MonitorControl/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = me.guillaumeb.MonitorControl; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "MonitorControl/Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -632,11 +635,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MonitorControlHelper/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = me.guillaumeb.MonitorControlHelper; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -655,11 +658,11 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MonitorControlHelper/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = me.guillaumeb.MonitorControlHelper; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/MonitorControl.xcodeproj/xcshareddata/xcschemes/MonitorControl.xcscheme b/MonitorControl.xcodeproj/xcshareddata/xcschemes/MonitorControl.xcscheme new file mode 100644 index 0000000..eaaeab2 --- /dev/null +++ b/MonitorControl.xcodeproj/xcshareddata/xcschemes/MonitorControl.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MonitorControl/AppDelegate.swift b/MonitorControl/AppDelegate.swift index 9a8401e..275b45c 100644 --- a/MonitorControl/AppDelegate.swift +++ b/MonitorControl/AppDelegate.swift @@ -44,18 +44,18 @@ class AppDelegate: NSObject, NSApplicationDelegate, MediaKeyTapDelegate { } mediaKeyTap = MediaKeyTap.init(delegate: self, for: keysListenedFor, observeBuiltIn: false) - let storyboard: NSStoryboard = NSStoryboard.init(name: NSStoryboard.Name(rawValue: "Main"), bundle: Bundle.main) + let storyboard: NSStoryboard = NSStoryboard.init(name: "Main", bundle: Bundle.main) let views = [ - storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier(rawValue: "MainPrefsVC")), - storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier(rawValue: "KeysPrefsVC")), - storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier(rawValue: "DisplayPrefsVC")) + storyboard.instantiateController(withIdentifier: "MainPrefsVC"), + storyboard.instantiateController(withIdentifier: "KeysPrefsVC"), + storyboard.instantiateController(withIdentifier: "DisplayPrefsVC") ] prefsController = MASPreferencesWindowController(viewControllers: views, title: NSLocalizedString("Preferences", comment: "Shown in Preferences window")) NotificationCenter.default.addObserver(self, selector: #selector(handleListenForChanged), name: NSNotification.Name.init(Utils.PrefKeys.listenFor.rawValue), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(handleShowContrastChanged), name: NSNotification.Name.init(Utils.PrefKeys.showContrast.rawValue), object: nil) - statusItem.image = NSImage.init(named: NSImage.Name(rawValue: "status")) + statusItem.image = NSImage.init(named: "status") statusItem.menu = statusMenu setDefaultPrefs() diff --git a/MonitorControl/Prefs/DisplayPrefsViewController.swift b/MonitorControl/Prefs/DisplayPrefsViewController.swift index 1f1a46e..3b933c7 100644 --- a/MonitorControl/Prefs/DisplayPrefsViewController.swift +++ b/MonitorControl/Prefs/DisplayPrefsViewController.swift @@ -13,7 +13,7 @@ class DisplayPrefsViewController: NSViewController, MASPreferencesViewController var viewIdentifier: String = "Display" var toolbarItemLabel: String? = NSLocalizedString("Display", comment: "Shown in the main prefs window") - var toolbarItemImage: NSImage? = NSImage.init(named: .computer) + var toolbarItemImage: NSImage? = NSImage.init(named: NSImage.computerName) let prefs = UserDefaults.standard var displays: [Display] = [] diff --git a/MonitorControl/Prefs/KeysPrefsViewController.swift b/MonitorControl/Prefs/KeysPrefsViewController.swift index c78b943..9c74dbf 100644 --- a/MonitorControl/Prefs/KeysPrefsViewController.swift +++ b/MonitorControl/Prefs/KeysPrefsViewController.swift @@ -13,7 +13,7 @@ class KeysPrefsViewController: NSViewController, MASPreferencesViewController { var viewIdentifier: String = "Keys" var toolbarItemLabel: String? = NSLocalizedString("Keys", comment: "Shown in the main prefs window") - var toolbarItemImage: NSImage? = NSImage.init(named: NSImage.Name.init("KeyboardPref")) + var toolbarItemImage: NSImage? = NSImage.init(named: "KeyboardPref") let prefs = UserDefaults.standard @IBOutlet var listenFor: NSPopUpButton! diff --git a/MonitorControl/Prefs/MainPrefsViewController.swift b/MonitorControl/Prefs/MainPrefsViewController.swift index 322ddca..128340b 100644 --- a/MonitorControl/Prefs/MainPrefsViewController.swift +++ b/MonitorControl/Prefs/MainPrefsViewController.swift @@ -14,7 +14,7 @@ class MainPrefsViewController: NSViewController, MASPreferencesViewController { var viewIdentifier: String = "Main" var toolbarItemLabel: String? = NSLocalizedString("General", comment: "Shown in the main prefs window") - var toolbarItemImage: NSImage? = NSImage.init(named: .preferencesGeneral) + var toolbarItemImage: NSImage? = NSImage.init(named: NSImage.preferencesGeneralName) let prefs = UserDefaults.standard @IBOutlet var startAtLogin: NSButton! diff --git a/Podfile b/Podfile index cc2533f..fb675d6 100644 --- a/Podfile +++ b/Podfile @@ -6,5 +6,5 @@ target 'MonitorControl' do use_frameworks! pod 'MediaKeyTap', :git => 'https://github.com/JoniVR/MediaKeyTap.git' - pod 'MASPreferences' + pod 'MASPreferences', :git => 'https://github.com/JoniVR/MASPreferences.git' end diff --git a/Podfile.lock b/Podfile.lock index 278727e..a3285f7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -3,18 +3,19 @@ PODS: - MediaKeyTap (2.1.0) DEPENDENCIES: - - MASPreferences + - MASPreferences (from `https://github.com/JoniVR/MASPreferences.git`) - MediaKeyTap (from `https://github.com/JoniVR/MediaKeyTap.git`) -SPEC REPOS: - https://github.com/cocoapods/specs.git: - - MASPreferences - EXTERNAL SOURCES: + MASPreferences: + :git: https://github.com/JoniVR/MASPreferences.git MediaKeyTap: :git: https://github.com/JoniVR/MediaKeyTap.git CHECKOUT OPTIONS: + MASPreferences: + :commit: 52b15d34b7509436c73d6e89d2b02bf29507df50 + :git: https://github.com/JoniVR/MASPreferences.git MediaKeyTap: :commit: a7afe10951d2800d94c04091c2684ec9e978fb3e :git: https://github.com/JoniVR/MediaKeyTap.git @@ -23,6 +24,6 @@ SPEC CHECKSUMS: MASPreferences: c08b8622dd17b47da87669e741efd7c92e970e8c MediaKeyTap: b652877e9ae2d52ca4f5310fa5152945ad3f0798 -PODFILE CHECKSUM: 137eb2d2a81f325194fe440e7625ffdf797d0818 +PODFILE CHECKSUM: ef3a41f0dd719b389cc8241f6f5dd5fe52e55556 COCOAPODS: 1.5.3