From a1cfd1de258d18c5ccddddcbdd0b63ebca31e8e2 Mon Sep 17 00:00:00 2001 From: lwouis Date: Sun, 26 Oct 2025 16:54:40 +0100 Subject: [PATCH] fix: title was truncated in app-icons appearance (closes #4860) fix was to update ci to use macos 15 and xcode 26, since the issue goes away when compiling with xcode 26, without any code change --- .github/workflows/ci_cd.yml | 4 ++-- Podfile | 2 ++ Podfile.lock | 2 +- Pods/Manifest.lock | 2 +- Pods/Pods.xcodeproj/project.pbxproj | 20 +++++++++---------- src/logic/BackgroundWork.swift | 2 +- .../events/RunningApplicationsEvents.swift | 4 ++-- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index cc5f4726..94be2df0 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -21,7 +21,7 @@ env: APP_NAME: AltTab jobs: build: - runs-on: macos-13 # Intel VM; see https://github.com/actions/runner-images/tree/main + runs-on: macos-15 # all options: https://github.com/actions/runner-images/tree/main environment: production steps: # - env: @@ -44,7 +44,7 @@ jobs: with: node-version: 16 cache: 'npm' - - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer + - run: sudo xcode-select -s /Applications/Xcode_26.0.1.app/Contents/Developer - run: scripts/print_env.sh - run: npm ci - run: npx commitlint --from "$GITHUB_EVENT_BEFORE" --to "$GITHUB_EVENT_AFTER" --verbose diff --git a/Podfile b/Podfile index 6ea59b0a..00f784fe 100644 --- a/Podfile +++ b/Podfile @@ -35,6 +35,8 @@ post_install do |installer| # disable code signing which is unnecessary for pods config.build_settings['CODE_SIGNING_REQUIRED'] = 'NO' config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO' + # set deployment_target for all pods, to avoid libarclite compiler error + config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target end end end diff --git a/Podfile.lock b/Podfile.lock index 05e42fa3..e26531db 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,6 +44,6 @@ SPEC CHECKSUMS: Sparkle: 1fa490bb4ab2a9b37cfb9ea4feec19dd33b81cd2 SwiftyBeaver: d39e7c376bf15e9fffca8263b8fd1f42ea56aa2d -PODFILE CHECKSUM: 171d8e3b49aa39f805e1814551d0f7e1bafd1572 +PODFILE CHECKSUM: c3fc354fa5ccad08f1b9f7302205cc969b4b0ef0 COCOAPODS: 1.16.2 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 05e42fa3..e26531db 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -44,6 +44,6 @@ SPEC CHECKSUMS: Sparkle: 1fa490bb4ab2a9b37cfb9ea4feec19dd33b81cd2 SwiftyBeaver: d39e7c376bf15e9fffca8263b8fd1f42ea56aa2d -PODFILE CHECKSUM: 171d8e3b49aa39f805e1814551d0f7e1bafd1572 +PODFILE CHECKSUM: c3fc354fa5ccad08f1b9f7302205cc969b4b0ef0 COCOAPODS: 1.16.2 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 522127f6..55599fac 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -1230,7 +1230,7 @@ COMBINE_HIDPI_IMAGES = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.12; SDKROOT = macosx; }; name = Release; @@ -1247,7 +1247,7 @@ COMBINE_HIDPI_IMAGES = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; SDKROOT = macosx; }; name = Debug; @@ -1264,7 +1264,7 @@ COMBINE_HIDPI_IMAGES = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; SDKROOT = macosx; }; name = Release; @@ -1293,7 +1293,7 @@ INFOPLIST_FILE = "Target Support Files/LetsMove/LetsMove-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/LetsMove/LetsMove.modulemap"; PRODUCT_MODULE_NAME = LetsMove; PRODUCT_NAME = LetsMove; @@ -1331,7 +1331,7 @@ INFOPLIST_FILE = "Target Support Files/LetsMove/LetsMove-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/LetsMove/LetsMove.modulemap"; PRODUCT_MODULE_NAME = LetsMove; PRODUCT_NAME = LetsMove; @@ -1369,7 +1369,7 @@ INFOPLIST_FILE = "Target Support Files/SwiftyBeaver/SwiftyBeaver-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/SwiftyBeaver/SwiftyBeaver.modulemap"; PRODUCT_MODULE_NAME = SwiftyBeaver; PRODUCT_NAME = SwiftyBeaver; @@ -1549,7 +1549,7 @@ INFOPLIST_FILE = "Target Support Files/SwiftyBeaver/SwiftyBeaver-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/SwiftyBeaver/SwiftyBeaver.modulemap"; PRODUCT_MODULE_NAME = SwiftyBeaver; PRODUCT_NAME = SwiftyBeaver; @@ -1575,7 +1575,7 @@ COMBINE_HIDPI_IMAGES = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.12; SDKROOT = macosx; }; name = Debug; @@ -1604,7 +1604,7 @@ INFOPLIST_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = com.kulakov.ShortcutRecorder; PRODUCT_MODULE_NAME = ShortcutRecorder; @@ -1643,7 +1643,7 @@ INFOPLIST_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = com.kulakov.ShortcutRecorder; PRODUCT_MODULE_NAME = ShortcutRecorder; diff --git a/src/logic/BackgroundWork.swift b/src/logic/BackgroundWork.swift index ec5feddf..97d039c9 100644 --- a/src/logic/BackgroundWork.swift +++ b/src/logic/BackgroundWork.swift @@ -140,7 +140,7 @@ class BackgroundWork { } } - class LabeledOperationQueue: OperationQueue { + class LabeledOperationQueue: OperationQueue, @unchecked Sendable { private let strongUnderlyingQueue: DispatchQueue init(_ label: String, _ qos: DispatchQoS, _ maxConcurrentOperationCount: Int) { diff --git a/src/logic/events/RunningApplicationsEvents.swift b/src/logic/events/RunningApplicationsEvents.swift index 12f51662..f22f96a5 100644 --- a/src/logic/events/RunningApplicationsEvents.swift +++ b/src/logic/events/RunningApplicationsEvents.swift @@ -6,10 +6,10 @@ class RunningApplicationsEvents { static func observe() { previousValueOfRunningApps = Set(NSWorkspace.shared.runningApplications) - appsObserver = NSWorkspace.shared.observe(\.runningApplications, options: [.old, .new], changeHandler: handleEvent) + appsObserver = NSWorkspace.shared.observe(\.runningApplications, options: [.old, .new], changeHandler: { (_, _) in handleEvent() }) } - private static func handleEvent(_: NSWorkspace, _ change: NSKeyValueObservedChange) { + private static func handleEvent() { let workspaceApps = Set(NSWorkspace.shared.runningApplications) let added = workspaceApps.subtracting(previousValueOfRunningApps) let removed = previousValueOfRunningApps.subtracting(workspaceApps)