Minor tweaks

Color Picker.xcodeproj/project.pbxproj

@@ -326,7 +326,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "swiftlint\n";
+			shellScript = "PATH=\"/opt/homebrew/bin/:${PATH}\"\nswiftlint\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -661,7 +661,7 @@
 			repositoryURL = "https://github.com/sindresorhus/Defaults";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 6.3.0;
+				minimumVersion = 7.1.0;
 			};
 		};
 		E3F4BC852788A5780075DC52 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {

Color Picker/App.swift

@@ -1,5 +1,4 @@
 import SwiftUI
-import Defaults
 import LaunchAtLogin
 
 /**

Color Picker/AppState.swift

@@ -1,6 +1,4 @@
 import SwiftUI
-import Combine
-import Defaults
 import Sentry
 
 @MainActor

Color Picker/ColorPanel.swift

@@ -1,5 +1,4 @@
 import Cocoa
-import Defaults
 
 @MainActor
 final class ColorPanel: NSColorPanel, NSWindowDelegate {

Color Picker/ColorPickerScreen.swift

@@ -1,5 +1,4 @@
 import SwiftUI
-import Defaults
 
 private struct RecentlyPickedColorsButton: View {
 	@EnvironmentObject private var appState: AppState

Color Picker/Constants.swift

@@ -1,5 +1,4 @@
 import Cocoa
-import Defaults
 import KeyboardShortcuts
 
 extension Defaults.Keys {

Color Picker/Events.swift

@@ -1,5 +1,4 @@
 import SwiftUI
-import Defaults
 import KeyboardShortcuts
 import LaunchAtLogin
 

Color Picker/SettingsScreen.swift

@@ -1,5 +1,4 @@
 import SwiftUI
-import Defaults
 import LaunchAtLogin
 import KeyboardShortcuts
 
@@ -29,6 +28,8 @@ private struct GeneralSettings: View {
 				Defaults.Toggle("Stay on top", key: .stayOnTop)
 					.help("Make the color picker window stay on top of all other windows.")
 					.padding(.bottom, 8)
+				Defaults.Toggle("Copy color in preferred format after picking", key: .copyColorAfterPicking)
+					.padding(.bottom, 8)
 				Defaults.Toggle("Show in menu bar instead of Dock", key: .showInMenuBar)
 					.help("If you have “Keep in Dock” enabled when activating this setting, you should disable that since the Dock icon will no longer be functional.")
 				Group {
@@ -123,7 +124,6 @@ private struct AdvancedSettings: View {
 		Form {
 			Defaults.Toggle("Show color sampler when opening window", key: .showColorSamplerOnOpen)
 				.help("Show the color picker loupe when the color picker window is shown.")
-			Defaults.Toggle("Copy color in preferred format after picking", key: .copyColorAfterPicking)
 			Defaults.Toggle("Use larger text in text fields", key: .largerText)
 		}
 			.padding()

Color Picker/Utilities.swift

@@ -9,6 +9,10 @@ import Regex
 import Sentry
 #endif
 
+typealias Defaults = _Defaults
+typealias Default = _Default
+typealias AnyCancellable = Combine.AnyCancellable
+
 /*
 Non-reusable utilities
 */