Make it possible to build AeroSpace on macOS 14 + Xcode 16.2

Author: nikitabobko

.github/workflows/build.yml

@@ -19,7 +19,9 @@ jobs:
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
         # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
         #
-        # Xcode version comparison: https://en.wikipedia.org/wiki/Xcode
+        # Xcode versions:
+        # - https://en.wikipedia.org/wiki/Xcode
+        # - https://xcodereleases.com/?scope=release
         os: [macos-13, macos-14, macos-15]
     name: Build
     runs-on: ${{ matrix.os }}

Sources/AppBundle/command/impl/CloseCommand.swift

@@ -11,7 +11,7 @@ struct CloseCommand: Command {
                 return io.err("Empty workspace")
             }
             // Access ax directly. Not cool :(
-            if try await args.quitIfLastWindow.andAsyncMainActor(try await window.macAppUnsafe.getAxWindowsCount() == 1) {
+            if try await args.quitIfLastWindow.andAsyncMainActor({ try await window.macAppUnsafe.getAxWindowsCount() == 1 }) {
                 let app = window.macAppUnsafe
                 if app.nsApp.terminate() {
                     for workspace in Workspace.all {

Sources/AppBundle/mouse/moveWithMouse.swift

@@ -18,7 +18,7 @@ private func moveWithMouseIfTheCase(_ window: Window) async throws { // todo cov
     if try await (window.isHiddenInCorner || // Don't allow to move windows of hidden workspaces
         !isLeftMouseButtonDown ||
         currentlyManipulatedWithMouseWindowId != nil && window.windowId != currentlyManipulatedWithMouseWindowId)
-        .orAsyncMainActor(try await getNativeFocusedWindow() != window)
+        .orAsyncMainActor({ try await getNativeFocusedWindow() != window })
     {
         return
     }

Sources/AppBundle/mouse/resizeWithMouse.swift

@@ -31,7 +31,7 @@ private func resizeWithMouseIfTheCase(_ window: Window) async throws { // todo c
     if try await (window.isHiddenInCorner || // Don't allow to resize windows of hidden workspaces
         !isLeftMouseButtonDown ||
         currentlyManipulatedWithMouseWindowId != nil && window.windowId != currentlyManipulatedWithMouseWindowId)
-        .orAsyncMainActor(try await getNativeFocusedWindow() != window)
+        .orAsyncMainActor({ try await getNativeFocusedWindow() != window })
     {
         return
     }

Sources/AppBundle/normalizeLayoutReason.swift

@@ -23,7 +23,7 @@ private func validateStillPopups() async throws {
 private func _normalizeLayoutReason(workspace: Workspace, windows: [Window]) async throws {
     for window in windows {
         let isMacosFullscreen = try await window.isMacosFullscreen
-        let isMacosMinimized = try await (!isMacosFullscreen).andAsyncMainActor(try await window.isMacosMinimized)
+        let isMacosMinimized = try await (!isMacosFullscreen).andAsyncMainActor { try await window.isMacosMinimized }
         let isMacosWindowOfHiddenApp = !isMacosFullscreen && !isMacosMinimized &&
             !config.automaticallyUnhideMacosHiddenApps && window.macAppUnsafe.nsApp.isHidden
         switch window.layoutReason {

Sources/Common/util/BoolEx.swift

@@ -5,7 +5,7 @@ import Foundation
 // https://forums.swift.org/t/potential-false-positive-sending-risks-causing-data-races/78859
 public extension Bool {
     @inlinable
-    func andAsync(isolation: isolated (any Actor)? = #isolation, _ rhs: @autoclosure () async throws -> Bool) async rethrows -> Bool {
+    func andAsync(isolation: isolated (any Actor)? = #isolation, _ rhs: () async throws -> Bool) async rethrows -> Bool {
         if self {
             return try await rhs()
         }
@@ -14,15 +14,15 @@ public extension Bool {
 
     @inlinable
     @MainActor
-    func andAsyncMainActor(_ rhs: @MainActor @Sendable @autoclosure () async throws -> Bool) async rethrows -> Bool {
+    func andAsyncMainActor(_ rhs: @MainActor @Sendable () async throws -> Bool) async rethrows -> Bool {
         if self {
             return try await rhs()
         }
         return false
     }
 
     @inlinable
-    func orAsync(isolation: isolated (any Actor)? = #isolation, _ rhs: @autoclosure () async throws -> Bool) async rethrows -> Bool {
+    func orAsync(isolation: isolated (any Actor)? = #isolation, _ rhs: () async throws -> Bool) async rethrows -> Bool {
         if self {
             return true
         }
@@ -31,7 +31,7 @@ public extension Bool {
 
     @inlinable
     @MainActor
-    func orAsyncMainActor(_ rhs: @MainActor @Sendable @autoclosure () async throws -> Bool) async rethrows -> Bool {
+    func orAsyncMainActor(_ rhs: @MainActor @Sendable () async throws -> Bool) async rethrows -> Bool {
         if self {
             return true
         }