Target macOS 10.15

sindresorhus · Feb 20, 2024 · 04b8db6 · 04b8db6
1 parent 3b11952
commit 04b8db6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ let package = Package(
 	name: "KeyboardShortcuts",
 	defaultLocalization: "en",
 	platforms: [
-		.macOS(.v10_13)
+		.macOS(.v10_15)
 	],
 	products: [
 		.library(

diff --git a/Sources/KeyboardShortcuts/KeyboardShortcuts.swift b/Sources/KeyboardShortcuts/KeyboardShortcuts.swift
@@ -457,7 +457,6 @@ public enum KeyboardShortcuts {
 }
 
 extension KeyboardShortcuts {
-	@available(macOS 10.15, *)
 	public enum EventType: Sendable {
 		case keyDown
 		case keyUp
@@ -492,7 +491,6 @@ extension KeyboardShortcuts {
 
 	- Note: This method is not affected by `.removeAllHandlers()`.
 	*/
-	@available(macOS 10.15, *)
 	public static func events(for name: Name) -> AsyncStream<KeyboardShortcuts.EventType> {
 		AsyncStream { continuation in
 			let id = UUID()
@@ -549,12 +547,10 @@ extension KeyboardShortcuts {
 
 	- Note: This method is not affected by `.removeAllHandlers()`.
 	*/
-	@available(macOS 10.15, *)
 	public static func events(_ type: EventType, for name: Name) -> AsyncFilterSequence<AsyncStream<EventType>> {
 		events(for: name).filter { $0 == type }
 	}
 
-	@available(macOS 10.15, *)
 	@available(*, deprecated, renamed: "events(_:for:)")
 	public static func on(_ type: EventType, for name: Name) -> AsyncStream<Void> {
 		AsyncStream { continuation in

diff --git a/Sources/KeyboardShortcuts/Recorder.swift b/Sources/KeyboardShortcuts/Recorder.swift
@@ -1,7 +1,6 @@
 #if os(macOS)
 import SwiftUI
 
-@available(macOS 10.15, *)
 extension KeyboardShortcuts {
 	private struct _Recorder: NSViewRepresentable { // swiftlint:disable:this type_name
 		typealias NSViewType = RecorderCocoa
@@ -88,7 +87,6 @@ extension KeyboardShortcuts {
 	}
 }
 
-@available(macOS 10.15, *)
 extension KeyboardShortcuts.Recorder<EmptyView> {
 	/**
 	- Parameter name: Strongly-typed keyboard shortcut name.
@@ -106,7 +104,6 @@ extension KeyboardShortcuts.Recorder<EmptyView> {
 	}
 }
 
-@available(macOS 10.15, *)
 extension KeyboardShortcuts.Recorder<Text> {
 	/**
 	- Parameter title: The title of the keyboard shortcut recorder, describing its purpose.
@@ -128,7 +125,6 @@ extension KeyboardShortcuts.Recorder<Text> {
 	}
 }
 
-@available(macOS 10.15, *)
 extension KeyboardShortcuts.Recorder<Text> {
 	/**
 	- Parameter title: The title of the keyboard shortcut recorder, describing its purpose.
@@ -151,7 +147,6 @@ extension KeyboardShortcuts.Recorder<Text> {
 	}
 }
 
-@available(macOS 10.15, *)
 extension KeyboardShortcuts.Recorder {
 	/**
 	- Parameter name: Strongly-typed keyboard shortcut name.
@@ -172,18 +167,16 @@ extension KeyboardShortcuts.Recorder {
 	}
 }
 
-@available(macOS 10.15, *)
 #Preview {
 	KeyboardShortcuts.Recorder("record_shortcut", name: .init("xcodePreview"))
 		.environment(\.locale, .init(identifier: "en"))
 }
 
-@available(macOS 10.15, *)
 #Preview {
 	KeyboardShortcuts.Recorder("record_shortcut", name: .init("xcodePreview"))
 		.environment(\.locale, .init(identifier: "zh-Hans"))
 }
-@available(macOS 10.15, *)
+
 #Preview {
 	KeyboardShortcuts.Recorder("record_shortcut", name: .init("xcodePreview"))
 		.environment(\.locale, .init(identifier: "ru"))

diff --git a/Sources/KeyboardShortcuts/Utilities.swift b/Sources/KeyboardShortcuts/Utilities.swift
@@ -429,7 +429,6 @@ final class ObjectAssociation<T> {
 }
 
 
-@available(macOS 10.15, *)
 extension HorizontalAlignment {
 	private enum ControlAlignment: AlignmentID {
 		static func defaultValue(in context: ViewDimensions) -> CGFloat { // swiftlint:disable:this no_cgfloat
@@ -440,7 +439,6 @@ extension HorizontalAlignment {
 	fileprivate static let controlAlignment = Self(ControlAlignment.self)
 }
 
-@available(macOS 10.15, *)
 extension View {
 	func formLabel(@ViewBuilder _ label: () -> some View) -> some View {
 		HStack(alignment: .firstTextBaseline) {

diff --git a/Sources/KeyboardShortcuts/ViewModifiers.swift b/Sources/KeyboardShortcuts/ViewModifiers.swift
@@ -13,7 +13,10 @@ extension View {
 	- Note: This method is not affected by `.removeAllHandlers()`.
 	*/
 	@MainActor
-	public func onKeyboardShortcut(_ shortcut: KeyboardShortcuts.Name, perform: @escaping (KeyboardShortcuts.EventType) -> Void) -> some View {
+	public func onKeyboardShortcut(
+		_ shortcut: KeyboardShortcuts.Name,
+		perform: @escaping (KeyboardShortcuts.EventType) -> Void
+	) -> some View {
 		task {
 			for await eventType in KeyboardShortcuts.events(for: shortcut) {
 				perform(eventType)
@@ -31,7 +34,11 @@ extension View {
 	- Note: This method is not affected by `.removeAllHandlers()`.
 	*/
 	@MainActor
-	public func onKeyboardShortcut(_ shortcut: KeyboardShortcuts.Name, type: KeyboardShortcuts.EventType, perform: @escaping () -> Void) -> some View {
+	public func onKeyboardShortcut(
+		_ shortcut: KeyboardShortcuts.Name,
+		type: KeyboardShortcuts.EventType,
+		perform: @escaping () -> Void
+	) -> some View {
 		task {
 			for await _ in KeyboardShortcuts.events(type, for: shortcut) {
 				perform()

diff --git a/readme.md b/readme.md
@@ -12,7 +12,7 @@ I'm happy to accept more configurability and features. PR welcome! What you see
 
 ## Requirements
 
-macOS 10.13+
+macOS 10.15+
 
 ## Install