From 19f1fd876dca72db0fff4089afc3a1749eb57843 Mon Sep 17 00:00:00 2001
From: Matt Kiazyk <mattkiazyk@gmail.com>
Date: Tue, 21 Nov 2023 23:50:25 -0600
Subject: [PATCH 1/2] fix: settings link on Sonoma not working

---
 Xcodes/Frontend/XcodeList/MainToolbar.swift | 27 +++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Xcodes/Frontend/XcodeList/MainToolbar.swift b/Xcodes/Frontend/XcodeList/MainToolbar.swift
index 69a48f24..e3553045 100644
--- a/Xcodes/Frontend/XcodeList/MainToolbar.swift
+++ b/Xcodes/Frontend/XcodeList/MainToolbar.swift
@@ -86,16 +86,23 @@ struct MainToolbarModifier: ViewModifier {
             .keyboardShortcut(KeyboardShortcut("i", modifiers: [.command, .option]))
             .help("InfoDescription")
             
-            Button(action: {
-                if #available(macOS 13, *) {
-                    NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
-                } else {
-                    NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
-                }   
-            }, label: {
-                Label("Preferences", systemImage: "gearshape")
-            })
-            .help("PreferencesDescription")
+            if #available(macOS 14, *) {
+                SettingsLink(label: {
+                    Label("Preferences", systemImage: "gearshape")
+                })
+                .help("PreferencesDescription")
+            } else {
+                Button(action: {
+                    if #available(macOS 13, *) {
+                        NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
+                    } else {
+                        NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
+                    }
+                }, label: {
+                    Label("Preferences", systemImage: "gearshape")
+                })
+                .help("PreferencesDescription")
+            }
             
             TextField("Search", text: $searchText)
                 .textFieldStyle(RoundedBorderTextFieldStyle())

From b9dc7bf75794c0157d1fbe050463b29009b89706 Mon Sep 17 00:00:00 2001
From: Matt Kiazyk <mattkiazyk@gmail.com>
Date: Wed, 22 Nov 2023 08:38:10 -0600
Subject: [PATCH 2/2] update runner to MacOS13, Xcode 15

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb4d569d..79fc835b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,10 +8,10 @@ on:
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - name: Run tests
       env:
-        DEVELOPER_DIR: /Applications/Xcode_14.2.app
+        DEVELOPER_DIR: /Applications/Xcode_15.0.1.app
       run: xcodebuild test -scheme Xcodes