Update Magnet.framework to v3.3.0 (#57)

* Update Magnet.framework v3.3.0 * Replace obsolete or deprecated methods
Clipy · May 17, 2021 · 7bc6ed8 · 7bc6ed8
1 parent 5959744
commit 7bc6ed8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Clipy/Magnet" "v3.2.0"
-github "Clipy/Sauce" "v2.1.0"
+github "Clipy/Magnet" "v3.3.0"
+github "Clipy/Sauce" "v2.2.0"
diff --git a/Carthage/Checkouts/Magnet b/Carthage/Checkouts/Magnet
diff --git a/Carthage/Checkouts/Sauce b/Carthage/Checkouts/Sauce
diff --git a/KeyHolder.podspec b/KeyHolder.podspec
@@ -10,5 +10,5 @@ Pod::Spec.new do |s|
   s.source_files = 'Lib/KeyHolder/**/*.swift'
   s.swift_version = '5.0'
   s.frameworks   = 'Carbon', 'Cocoa'
-  s.dependency 'Magnet', '~> 3.2'
+  s.dependency 'Magnet', '~> 3.3.0'
 end
diff --git a/Lib/KeyHolder/RecordView.swift b/Lib/KeyHolder/RecordView.swift
@@ -143,7 +143,7 @@ open class RecordView: NSView {
 
     private func drawModifiers(_ dirtyRect: NSRect) {
         let fontSize = self.fontSize
-        let modifiers = keyCombo?.modifiers.convertSupportCocoaModifiers() ?? inputModifiers
+        let modifiers = keyCombo.map { NSEvent.ModifierFlags(carbonModifiers: $0.modifiers) } ?? inputModifiers
         for (i, text) in validModifiersText.enumerated() {
             let rect = NSRect(x: marginX + (fontSize * CGFloat(i)), y: marginY, width: fontSize, height: bounds.height)
             text.draw(in: rect, withAttributes: modifierTextAttributes(modifiers, checkModifier: validModifiers[i]))
@@ -208,7 +208,7 @@ open class RecordView: NSView {
 
     override open func performKeyEquivalent(with theEvent: NSEvent) -> Bool {
         guard isFirstResponder else { return false }
-        guard let key = Sauce.shared.key(by: Int(theEvent.keyCode)) else { return false }
+        guard let key = Sauce.shared.key(for: Int(theEvent.keyCode)) else { return false }
 
         if theEvent.modifierFlags.carbonModifiers() != 0 {
             let modifiers = theEvent.modifierFlags.carbonModifiers()

diff --git a/Package.swift b/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
             targets: ["KeyHolder"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/Clipy/Magnet", from: "3.2.0"),
+        .package(url: "https://github.com/Clipy/Magnet", .upToNextMinor(from: "3.3.0")),
     ],
     targets: [
         .target(
+18 −7		.github/workflows/Danger.yml
+16 −0		.github/workflows/Swift-Build.yml
+3 −3		.github/workflows/Xcode-Build.yml
+2 −2		.gitignore
+1 −1		Cartfile.resolved
+1 −1		Carthage/Checkouts/Sauce
+1 −0		Dangerfile
+13 −13		Gemfile.lock
+3 −15		Lib/Magnet/Extensions/IntExtension.swift
+51 −15		Lib/Magnet/Extensions/NSEventExtension.swift
+1 −1		Lib/Magnet/Info.plist
+10 −10		Lib/Magnet/KeyCombo.swift
+2 −2		Magnet.podspec
+0 −1		Mintfile
+1 −1		Package.swift
+1 −1		README.md
+19 −7		.github/workflows/Danger.yml
+14 −0		.github/workflows/Swift-Build.yml
+2 −2		.github/workflows/Xcode-Build.yml
+1 −2		.gitignore
+1 −0		Dangerfile
+4 −4		Example/Example/ViewController.swift
+1 −1		Gemfile.lock
+8 −0		Lib/Sauce.xcodeproj/project.pbxproj
+1 −1		Lib/Sauce/Info.plist
+2 −0		Lib/Sauce/Key.swift
+9 −9		Lib/Sauce/KeyboardLayout.swift
+23 −0		Lib/Sauce/NSMenuItem+Key.swift
+23 −23		Lib/Sauce/Sauce.swift
+19 −19		Lib/SauceTests/KeyboardLayoutTests.swift
+29 −0		Lib/SauceTests/NSMenuItem+KeyTests.swift
+0 −1		Mintfile
+7 −7		README.md
+1 −1		Sauce.podspec