From c13662730cb5bc28de4a799854bbb018a90649bf Mon Sep 17 00:00:00 2001 From: Sam Soffes Date: Fri, 27 Sep 2019 12:24:12 -0700 Subject: [PATCH] Version 0.1.3 --- HotKey.xcodeproj/project.pbxproj | 2 ++ Sources/HotKey/KeyCombo+System.swift | 8 ++++---- Support/Info.plist | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/HotKey.xcodeproj/project.pbxproj b/HotKey.xcodeproj/project.pbxproj index 6b1c364..c9699b0 100644 --- a/HotKey.xcodeproj/project.pbxproj +++ b/HotKey.xcodeproj/project.pbxproj @@ -528,6 +528,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 0.1.3; PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.HotKey; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -547,6 +548,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 0.1.3; PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.HotKey; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/Sources/HotKey/KeyCombo+System.swift b/Sources/HotKey/KeyCombo+System.swift index 7581f54..f64a855 100644 --- a/Sources/HotKey/KeyCombo+System.swift +++ b/Sources/HotKey/KeyCombo+System.swift @@ -5,7 +5,7 @@ extension KeyCombo { /// All system key combos /// /// - returns: array of key combos - static func systemKeyCombos() -> [KeyCombo] { + public static func systemKeyCombos() -> [KeyCombo] { var unmanagedGlobalHotkeys: Unmanaged? guard CopySymbolicHotKeys(&unmanagedGlobalHotkeys) == noErr, let globalHotkeys = unmanagedGlobalHotkeys?.takeRetainedValue() else @@ -33,7 +33,7 @@ extension KeyCombo { /// All key combos in the application’s main window /// /// - returns: array of key combos - static func mainMenuKeyCombos() -> [KeyCombo] { + public static func mainMenuKeyCombos() -> [KeyCombo] { guard let menu = NSApp.mainMenu else { return [] } @@ -46,7 +46,7 @@ extension KeyCombo { /// - parameter menu: menu to search /// /// - returns: array of key combos - static func keyCombos(in menu: NSMenu) -> [KeyCombo] { + public static func keyCombos(in menu: NSMenu) -> [KeyCombo] { var keyCombos = [KeyCombo]() for item in menu.items { @@ -65,7 +65,7 @@ extension KeyCombo { /// Standard application key combos /// /// - returns: array of key combos - static func standardKeyCombos() -> [KeyCombo] { + public static func standardKeyCombos() -> [KeyCombo] { return [ // Application KeyCombo(key: .comma, modifiers: .command), diff --git a/Support/Info.plist b/Support/Info.plist index 9c2f5b0..448ccf6 100644 --- a/Support/Info.plist +++ b/Support/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.1.2 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright