diff --git a/Example/KeyboardShortcutsExample/MainScreen.swift b/Example/KeyboardShortcutsExample/MainScreen.swift index 0eb99bea..329fc169 100644 --- a/Example/KeyboardShortcutsExample/MainScreen.swift +++ b/Example/KeyboardShortcutsExample/MainScreen.swift @@ -131,8 +131,6 @@ struct MainScreen: View { } } -struct MainScreen_Previews: PreviewProvider { - static var previews: some View { - MainScreen() - } +#Preview { + MainScreen() } diff --git a/Package.swift b/Package.swift index 99b5e695..12f6e402 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.9 import PackageDescription let package = Package( diff --git a/Sources/KeyboardShortcuts/KeyboardShortcuts.swift b/Sources/KeyboardShortcuts/KeyboardShortcuts.swift index ae07baed..02e5b3e4 100644 --- a/Sources/KeyboardShortcuts/KeyboardShortcuts.swift +++ b/Sources/KeyboardShortcuts/KeyboardShortcuts.swift @@ -362,7 +362,7 @@ public enum KeyboardShortcuts { You can safely call this even if the user has not yet set a keyboard shortcut. It will just be inactive until they do. ```swift - import Cocoa + import AppKit import KeyboardShortcuts @main @@ -388,7 +388,7 @@ public enum KeyboardShortcuts { You can safely call this even if the user has not yet set a keyboard shortcut. It will just be inactive until they do. ```swift - import Cocoa + import AppKit import KeyboardShortcuts @main diff --git a/Sources/KeyboardShortcuts/NSMenuItem++.swift b/Sources/KeyboardShortcuts/NSMenuItem++.swift index 1dd646ba..c45aa8c8 100644 --- a/Sources/KeyboardShortcuts/NSMenuItem++.swift +++ b/Sources/KeyboardShortcuts/NSMenuItem++.swift @@ -25,7 +25,7 @@ extension NSMenuItem { This method overrides `.keyEquivalent` and `.keyEquivalentModifierMask`. ```swift - import Cocoa + import AppKit import KeyboardShortcuts extension KeyboardShortcuts.Name { diff --git a/Sources/KeyboardShortcuts/Recorder.swift b/Sources/KeyboardShortcuts/Recorder.swift index 6650a209..189a3c1a 100644 --- a/Sources/KeyboardShortcuts/Recorder.swift +++ b/Sources/KeyboardShortcuts/Recorder.swift @@ -149,15 +149,18 @@ extension KeyboardShortcuts.Recorder { } @available(macOS 10.15, *) -struct SwiftUI_Previews: PreviewProvider { - static var previews: some View { - Group { - KeyboardShortcuts.Recorder(for: .init("xcodePreview")) - .environment(\.locale, .init(identifier: "en")) - KeyboardShortcuts.Recorder(for: .init("xcodePreview")) - .environment(\.locale, .init(identifier: "zh-Hans")) - KeyboardShortcuts.Recorder(for: .init("xcodePreview")) - .environment(\.locale, .init(identifier: "ru")) - } - } +#Preview { + KeyboardShortcuts.Recorder(for: .init("xcodePreview")) + .environment(\.locale, .init(identifier: "en")) +} + +@available(macOS 10.15, *) +#Preview { + KeyboardShortcuts.Recorder(for: .init("xcodePreview")) + .environment(\.locale, .init(identifier: "zh-Hans")) +} +@available(macOS 10.15, *) +#Preview { + KeyboardShortcuts.Recorder(for: .init("xcodePreview")) + .environment(\.locale, .init(identifier: "ru")) } diff --git a/Sources/KeyboardShortcuts/RecorderCocoa.swift b/Sources/KeyboardShortcuts/RecorderCocoa.swift index e3b75a23..920bb758 100644 --- a/Sources/KeyboardShortcuts/RecorderCocoa.swift +++ b/Sources/KeyboardShortcuts/RecorderCocoa.swift @@ -1,4 +1,4 @@ -import Cocoa +import AppKit import Carbon.HIToolbox extension KeyboardShortcuts { @@ -12,7 +12,7 @@ extension KeyboardShortcuts { It takes care of storing the keyboard shortcut in `UserDefaults` for you. ```swift - import Cocoa + import AppKit import KeyboardShortcuts final class SettingsViewController: NSViewController { diff --git a/Sources/KeyboardShortcuts/Shortcut.swift b/Sources/KeyboardShortcuts/Shortcut.swift index c6dc4050..a0c4b072 100644 --- a/Sources/KeyboardShortcuts/Shortcut.swift +++ b/Sources/KeyboardShortcuts/Shortcut.swift @@ -1,4 +1,4 @@ -import Cocoa +import AppKit import Carbon.HIToolbox extension KeyboardShortcuts { diff --git a/Sources/KeyboardShortcuts/Utilities.swift b/Sources/KeyboardShortcuts/Utilities.swift index 4935f3ee..083ded37 100644 --- a/Sources/KeyboardShortcuts/Utilities.swift +++ b/Sources/KeyboardShortcuts/Utilities.swift @@ -395,15 +395,15 @@ enum AssociationPolicy { var rawValue: objc_AssociationPolicy { switch self { case .assign: - return .OBJC_ASSOCIATION_ASSIGN + .OBJC_ASSOCIATION_ASSIGN case .retainNonatomic: - return .OBJC_ASSOCIATION_RETAIN_NONATOMIC + .OBJC_ASSOCIATION_RETAIN_NONATOMIC case .copyNonatomic: - return .OBJC_ASSOCIATION_COPY_NONATOMIC + .OBJC_ASSOCIATION_COPY_NONATOMIC case .retain: - return .OBJC_ASSOCIATION_RETAIN + .OBJC_ASSOCIATION_RETAIN case .copy: - return .OBJC_ASSOCIATION_COPY + .OBJC_ASSOCIATION_COPY } } } diff --git a/readme.md b/readme.md index 487479a3..f842a399 100644 --- a/readme.md +++ b/readme.md @@ -100,7 +100,7 @@ You can also find a [real-world example](https://github.com/sindresorhus/Plash/b Using [`KeyboardShortcuts.RecorderCocoa`](Sources/KeyboardShortcuts/RecorderCocoa.swift) instead of `KeyboardShortcuts.Recorder`: ```swift -import Cocoa +import AppKit import KeyboardShortcuts final class SettingsViewController: NSViewController {