Clipy · Econa77 · May 9, 2026 · May 9, 2026 · May 9, 2026 · May 9, 2026
@@ -1,2 +1,2 @@
-github "Clipy/Magnet" "v3.4.0"
-github "Clipy/Sauce" "v2.4.0"
+github "Clipy/Magnet" "v3.5.0"
+github "Clipy/Sauce" "v2.5.0"
@@ -346,6 +346,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -360,6 +361,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

@@ -424,6 +424,7 @@
 				INFOPLIST_FILE = KeyHolder/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.KeyHolder";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -446,6 +447,7 @@
 				INFOPLIST_FILE = KeyHolder/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.KeyHolder";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -459,6 +461,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = KeyHolderTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.KeyHolderTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
@@ -472,6 +475,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = KeyHolderTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.KeyHolderTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;

@@ -208,19 +208,19 @@ open class RecordView: NSView {
 
     override open func performKeyEquivalent(with theEvent: NSEvent) -> Bool {
         guard isFirstResponder else { return false }
-        guard let key = Sauce.shared.key(for: Int(theEvent.keyCode)) else { return false }
+        let modifiers = theEvent.modifierFlags.carbonModifiers()
+        guard let key = Sauce.shared.key(for: Int(theEvent.keyCode), carbonModifiers: modifiers) else { return false }
 
-        if theEvent.modifierFlags.carbonModifiers() != 0 {
-            let modifiers = theEvent.modifierFlags.carbonModifiers()
-            guard let keyCombo = KeyCombo(key: key, carbonModifiers: modifiers) else { return false }
+        if modifiers != 0 {
+            let keyCombo = KeyCombo(key: key, carbonModifiers: modifiers)
             guard delegate?.recordView(self, canRecordKeyCombo: keyCombo) ?? true else { return false }
             self.keyCombo = keyCombo
             didChange?(keyCombo)
             delegate?.recordView(self, didChangeKeyCombo: keyCombo)
             endRecording()
             return true
         } else if key.isFunctionKey {
-            guard let keyCombo = KeyCombo(key: key, cocoaModifiers: []) else { return false }
+            let keyCombo = KeyCombo(key: key, cocoaModifiers: [])
             guard delegate?.recordView(self, canRecordKeyCombo: keyCombo) ?? true else { return false }
             self.keyCombo = keyCombo
             didChange?(keyCombo)

@@ -11,21 +11,4 @@
 import XCTest
 @testable import KeyHolder
 
-class KeyHolderTests: XCTestCase {
-
-    override func setUp() {
-        super.setUp()
-    }
-
-    override func tearDown() {
-        super.tearDown()
-    }
-
-    func testExample() {}
-
-    func testPerformanceExample() {
-        self.measure {
-        }
-    }
-
-}
+class KeyHolderTests: XCTestCase {}
@@ -1,29 +1,32 @@
-// swift-tools-version:5.1
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
     name: "KeyHolder",
     platforms: [
-      .macOS(.v10_13)
+      .macOS(.v11)
     ],
     products: [
         .library(
             name: "KeyHolder",
             targets: ["KeyHolder"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/Clipy/Magnet", .upToNextMinor(from: "3.4.0")),
+        .package(url: "https://github.com/Clipy/Magnet", .upToNextMinor(from: "3.5.0")),
     ],
     targets: [
         .target(
             name: "KeyHolder",
             dependencies: ["Magnet"],
-            path: "Lib/KeyHolder"),
+            path: "Lib/KeyHolder",
+            exclude: ["Info.plist"]
+        ),
         .testTarget(
             name: "KeyHolderTests",
             dependencies: ["KeyHolder"],
-            path: "Lib/KeyHolderTests"),
+            path: "Lib/KeyHolderTests",
+            exclude: ["Info.plist"]
+        ),
     ],
     swiftLanguageVersions: [.v5]
 )
+1 −0		.github/CODEOWNERS
+21 −45		.github/workflows/Danger.yml
+5 −5		.github/workflows/Swift-Build.yml
+5 −5		.github/workflows/Xcode-Build.yml
+1 −1		Cartfile.resolved
+1 −1		Carthage/Checkouts/Sauce
+1 −1		Dangerfile
+2 −0		Example/Example.xcodeproj/project.pbxproj
+4 −3		Example/Example/AppDelegate.swift
+78 −64		Gemfile.lock
+8 −4		Lib/Magnet.xcodeproj/project.pbxproj
+9 −13		Lib/Magnet.xcodeproj/xcshareddata/xcschemes/Magnet.xcscheme
+1 −5		Lib/Magnet/Extensions/NSEventExtension.swift
+22 −0		Lib/Magnet/Extensions/NSMenuItem+keyCombo.swift
+38 −12		Lib/Magnet/HotKey.swift
+61 −39		Lib/Magnet/HotKeyCenter.swift
+9 −10		Lib/Magnet/KeyCombo.swift
+3 −3		Lib/Magnet/ModifierEventHandler.swift
+12 −14		Lib/MagnetTests/CollectionExtensionTests.swift
+316 −249		Lib/MagnetTests/KeyComboTests.swift
+60 −62		Lib/MagnetTests/ModifierEventHandlerTests.swift
+0 −14		Magnet.podspec
+9 −6		Package.swift
+0 −15		README.md
+1 −0		.github/CODEOWNERS
+21 −47		.github/workflows/Danger.yml
+5 −5		.github/workflows/Swift-Build.yml
+6 −5		.github/workflows/Xcode-Build.yml
+1 −1		Dangerfile
+4 −2		Example/Example.xcodeproj/project.pbxproj
+89 −85		Gemfile.lock
+56 −16		Lib/Sauce.xcodeproj/project.pbxproj
+2 −1		Lib/Sauce.xcodeproj/xcshareddata/xcschemes/Sauce.xcscheme
+4 −4		Lib/Sauce/InputSource.swift
+37 −0		Lib/Sauce/Internal/KeyMappingModifiers.swift
+62 −30		Lib/Sauce/Internal/KeyboardLayout.swift
+5 −3		Lib/Sauce/Internal/SpecialKeyCode.swift
+3 −1		Lib/Sauce/Internal/TISInputSource+Property.swift
+4 −3		Lib/Sauce/Key.swift
+7 −5		Lib/Sauce/ModifierTransformer.swift
+2 −0		Lib/Sauce/NSMenuItem+Key.swift
+66 −33		Lib/Sauce/Sauce.swift
+41 −0		Lib/SauceTests/Extensions/InputSource+Extensions.swift
+198 −173		Lib/SauceTests/KeyboardLayoutTests.swift
+10 −9		Lib/SauceTests/NSMenuItem+KeyTests.swift
+67 −0		Lib/SauceTests/Traits/InputSourceTrait.swift
+8 −6		Package.swift
+0 −15		README.md
+0 −13		Sauce.podspec