github-starred/MonitorControl
2
0
Fork 0
mirror of https://github.com/MonitorControl/MonitorControl.git synced 2026-05-16 06:05:52 -06:00
Code Issues 21 Projects Packages Wiki Activity Actions

update to Swift 4.2, update dependencies

Browse source
This commit is contained in:
JoniVR 2018-12-15 23:54:38 +01:00
parent 9c4ba8172e
commit c5aaff99bf
8 changed files with 119 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MonitorControl.xcodeproj/project.pbxproj
View file

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

91
MonitorControl.xcodeproj/xcshareddata/xcschemes/MonitorControl.xcscheme Normal file
View file

@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56754EAA1D9A4016007BCDC5"
BuildableName = "MonitorControl.app"
BlueprintName = "MonitorControl"
ReferencedContainer = "container:MonitorControl.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56754EAA1D9A4016007BCDC5"
BuildableName = "MonitorControl.app"
BlueprintName = "MonitorControl"
ReferencedContainer = "container:MonitorControl.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56754EAA1D9A4016007BCDC5"
BuildableName = "MonitorControl.app"
BlueprintName = "MonitorControl"
ReferencedContainer = "container:MonitorControl.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "56754EAA1D9A4016007BCDC5"
BuildableName = "MonitorControl.app"
BlueprintName = "MonitorControl"
ReferencedContainer = "container:MonitorControl.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

10
MonitorControl/AppDelegate.swift
View file

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

2
MonitorControl/Prefs/DisplayPrefsViewController.swift
View file

@ -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] = []

2
MonitorControl/Prefs/KeysPrefsViewController.swift
View file

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

2
MonitorControl/Prefs/MainPrefsViewController.swift
View file

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

2
Podfile
View file

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

13
Podfile.lock
View file

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