From 189b45fa952e33bb65a25c5e55db2d043f838fda Mon Sep 17 00:00:00 2001
From: Sindre Sorhus <sindresorhus@gmail.com>
Date: Tue, 28 Mar 2023 14:51:19 +0900
Subject: [PATCH] 1.13.0

---
 Color Picker.xcodeproj/project.pbxproj        |  7 ++--
 .../xcschemes/Color Picker.xcscheme           |  2 +-
 Color Picker/App.swift                        |  8 +---
 Color Picker/AppState.swift                   |  1 -
 Color Picker/Events.swift                     |  4 +-
 Color Picker/Utilities.swift                  | 38 +++++++++++++------
 Config.xcconfig                               |  4 +-
 readme.md                                     | 11 +++++-
 8 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/Color Picker.xcodeproj/project.pbxproj b/Color Picker.xcodeproj/project.pbxproj
index 01b2079..b583c24 100644
--- a/Color Picker.xcodeproj/project.pbxproj	
+++ b/Color Picker.xcodeproj/project.pbxproj	
@@ -233,8 +233,9 @@
 		E3A3B11125904E7B001B4D0C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					E34BFA932988F3AF002AB421 = {
 						CreatedOnToolsVersion = 14.2;
@@ -456,7 +457,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 13.1;
+				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -514,7 +515,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 13.1;
+				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
diff --git a/Color Picker.xcodeproj/xcshareddata/xcschemes/Color Picker.xcscheme b/Color Picker.xcodeproj/xcshareddata/xcschemes/Color Picker.xcscheme
index 4e68840..4dc1324 100644
--- a/Color Picker.xcodeproj/xcshareddata/xcschemes/Color Picker.xcscheme	
+++ b/Color Picker.xcodeproj/xcshareddata/xcschemes/Color Picker.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Color Picker/App.swift b/Color Picker/App.swift
index 147a6cc..807a793 100644
--- a/Color Picker/App.swift	
+++ b/Color Picker/App.swift	
@@ -80,13 +80,7 @@ struct AppMain: App {
 	}
 
 	private func setUpConfig() {
-		#if !DEBUG
-		SentrySDK.start {
-			$0.dsn = "https://e89cb93d693444ee8829f521ab75025a@o844094.ingest.sentry.io/6139060"
-			$0.enableSwizzling = false
-			$0.enableAppHangTracking = false // https://github.com/getsentry/sentry-cocoa/issues/2643
-		}
-		#endif
+		SSApp.initSentry("https://e89cb93d693444ee8829f521ab75025a@o844094.ingest.sentry.io/6139060")
 	}
 }
 
diff --git a/Color Picker/AppState.swift b/Color Picker/AppState.swift
index 3a944b6..302b984 100644
--- a/Color Picker/AppState.swift	
+++ b/Color Picker/AppState.swift	
@@ -1,5 +1,4 @@
 import SwiftUI
-import Sentry
 
 @MainActor
 final class AppState: ObservableObject {
diff --git a/Color Picker/Events.swift b/Color Picker/Events.swift
index 4b1ed51..a155e59 100644
--- a/Color Picker/Events.swift	
+++ b/Color Picker/Events.swift	
@@ -9,7 +9,7 @@ extension AppState {
 			.sink { [self] in
 				// We only set the state if it's in Dock mode or menu bar mode showing the icon.
 				if !$0.newValue || ($0.newValue && !Defaults[.hideMenuBarIcon]) {
-					self.statusItem.isVisible = $0.newValue
+					statusItem.isVisible = $0.newValue
 				}
 
 				SSApp.isDockIconVisible = !$0.newValue
@@ -17,7 +17,7 @@ extension AppState {
 
 				if !$0.newValue {
 					LaunchAtLogin.isEnabled = false
-					self.colorPanel.makeKeyAndOrderFront(nil)
+					colorPanel.makeKeyAndOrderFront(nil)
 				}
 			}
 			.store(in: &cancellables)
diff --git a/Color Picker/Utilities.swift b/Color Picker/Utilities.swift
index aa26a20..306eb37 100644
--- a/Color Picker/Utilities.swift	
+++ b/Color Picker/Utilities.swift	
@@ -218,6 +218,22 @@ extension SSApp {
 }
 
 
+extension SSApp {
+	/**
+	Initialize Sentry.
+	*/
+	static func initSentry(_ dsn: String) {
+		#if !DEBUG && canImport(Sentry)
+		SentrySDK.start {
+			$0.dsn = dsn
+			$0.enableSwizzling = false
+			$0.enableAppHangTracking = false // https://github.com/getsentry/sentry-cocoa/issues/2643
+		}
+		#endif
+	}
+}
+
+
 enum Device {
 	static let osVersion: String = {
 		let os = ProcessInfo.processInfo.operatingSystemVersion
@@ -409,9 +425,9 @@ final class LocalEventMonitor: ObservableObject {
 				return event
 			}
 
-			self.objectWillChange.send(event)
+			objectWillChange.send(event)
 
-			if let callback = self.callback {
+			if let callback {
 				return callback(event)
 			}
 
@@ -1042,7 +1058,7 @@ struct NativeTextField: NSViewRepresentable {
 					return
 				}
 
-				self.unfocus()
+				unfocus()
 			}.start()
 
 			// Cannot be `.leftMouseUp` as the color wheel swallows it.
@@ -1059,14 +1075,14 @@ struct NativeTextField: NSViewRepresentable {
 					return event
 				}
 
-				let clickPoint = self.convert(event.locationInWindow, from: nil)
+				let clickPoint = convert(event.locationInWindow, from: nil)
 				let clickMargin = 3.0
 
-				if !self.frame.insetBy(dx: -clickMargin, dy: -clickMargin).contains(clickPoint) {
-					self.unfocus()
+				if !frame.insetBy(dx: -clickMargin, dy: -clickMargin).contains(clickPoint) {
+					unfocus()
 					return nil
 				} else {
-					self.parent.isFocused = true
+					parent.isFocused = true
 				}
 
 				return event
@@ -1321,7 +1337,7 @@ extension ControlActionClosureProtocol {
 
 			let trampoline = ActionTrampoline(action: newValue)
 			target = trampoline
-			self.action = #selector(ActionTrampoline.handleAction)
+			action = #selector(ActionTrampoline.handleAction)
 			objc_setAssociatedObject(self, &controlActionClosureProtocolAssociatedObjectKey, trampoline, .OBJC_ASSOCIATION_RETAIN)
 		}
 	}
@@ -1773,9 +1789,9 @@ extension NSPasteboard {
 						}
 
 						if isActive {
-							self.start()
+							start()
 						} else {
-							self.stop()
+							stop()
 						}
 					}
 					.store(in: &cancellables)
@@ -2367,7 +2383,7 @@ extension Binding where Value: SetAlgebra, Value.Element: Hashable {
 	}
 	```
 	*/
-	func contains<T>(_ element: T) -> Binding<Bool> where T == Value.Element {
+	func contains(_ element: Value.Element) -> Binding<Bool> {
 		.init(
 			get: { wrappedValue.contains(element) },
 			set: {
diff --git a/Config.xcconfig b/Config.xcconfig
index 56cb4fc..7cb373a 100644
--- a/Config.xcconfig
+++ b/Config.xcconfig
@@ -1,2 +1,2 @@
-MARKETING_VERSION = 1.12.1
-CURRENT_PROJECT_VERSION = 34
+MARKETING_VERSION = 1.13.0
+CURRENT_PROJECT_VERSION = 36
diff --git a/readme.md b/readme.md
index 69f7ccc..f24c420 100644
--- a/readme.md
+++ b/readme.md
@@ -17,11 +17,18 @@ The macOS color picker as an app with lots of extra features.
 
 [![](https://tools.applemediaservices.com/api/badges/download-on-the-mac-app-store/black/en-us?size=250x83&releaseDate=1615852800)](https://apps.apple.com/app/id1545870783)
 
-Requires macOS 12 or later.
+Requires macOS 13 or later.
 
 **Older versions**
 
-- [Last macOS 11 compatible version](https://github.com/sindresorhus/System-Color-Picker/releases/download/v1.9.6/Color.Picker.1.9.6.-.macOS.11.zip) *(1.9.6)*
+- [1.12.1](https://github.com/sindresorhus/System-Color-Picker/releases/download/v1.12.1/Color.Picker.1.12.1.-.macOS.12.zip) for macOS 12+
+- [1.9.6](https://github.com/sindresorhus/System-Color-Picker/releases/download/v1.9.6/Color.Picker.1.9.6.-.macOS.11.zip) for macOS 11+
+
+**Non-App Store version**
+
+A special version for users that cannot access the App Store. It won't receive updates.
+
+[Download](https://dsc.cloud/sindresorhus/Color-Picker-1.13.0-1679983870.zip) *(1.13.0 · macOS 13+)*
 
 ## Features