Merge branch 'dev' into openai

tisfeng · Feb 15, 2024 · c353fa8 · c353fa8
2 parents 0c97fd4 + 37538b8
commit c353fa8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -27,7 +27,7 @@ jobs:
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - https://gh.io/using-larger-runners
     # Consider using larger runners for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-14') || 'ubuntu-latest' }}
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-13') || 'ubuntu-latest' }}
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       actions: read
@@ -48,7 +48,7 @@ jobs:
       if: matrix.language == 'swift'
       uses: maxim-lobanov/setup-xcode@v1
       with:
-          xcode-version: '15.2'
+          xcode-version: '15.1'
 
     - name: Checkout repository
       uses: actions/checkout@v4

diff --git a/Easydict/SwiftApp/Configuration/Configuration.swift b/Easydict/SwiftApp/Configuration/Configuration.swift
@@ -220,7 +220,7 @@ let kHideMenuBarIconKey = "EZConfiguration_kHideMenuBarIconKey"
         )
 
         cancellables.append(
-            Defaults.publisher(.launchAtStartup)
+            Defaults.publisher(.launchAtStartup, options: [])
                 .removeDuplicates()
                 .sink { [weak self] change in
                     self?.didSetLaunchAtStartup(change.oldValue, new: change.newValue)