Use os(iOS) && !targetEnvironment(macCatalyst) for ActivityKit guards

Mac Catalyst reports os(iOS) as true but ActivityKit APIs are marked
unavailable on it. Replace all ActivityKit-specific #if os(iOS) guards
with #if os(iOS) && !targetEnvironment(macCatalyst) to exclude the
code from Mac Catalyst compilation.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: rwarner

Sources/App/AppDelegate.swift

@@ -374,7 +374,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     private func setupLiveActivityReattachment() {
-        #if os(iOS)
+        #if os(iOS) && !targetEnvironment(macCatalyst)
         if #available(iOS 17.2, *) {
             // Pre-warm the registry on the main thread before spawning background Tasks.
             // This avoids a lazy-init race if a push notification handler accesses it

Sources/App/Settings/LiveActivity/LiveActivitySettingsView.swift

@@ -1,4 +1,4 @@
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 import ActivityKit
 import Shared
 import SwiftUI

Sources/App/Settings/Settings/SettingsItem.swift

@@ -112,7 +112,7 @@ enum SettingsItem: String, Hashable, CaseIterable {
         case .notifications:
             SettingsNotificationsView()
         case .liveActivities:
-            #if os(iOS)
+            #if os(iOS) && !targetEnvironment(macCatalyst)
             if #available(iOS 17.2, *) {
                 LiveActivitySettingsView()
             }

Sources/Shared/API/HAAPI.swift

@@ -11,7 +11,7 @@ import Version
 #if os(iOS)
 import Reachability
 #endif
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 import ActivityKit
 #endif
 
@@ -562,7 +562,7 @@ public class HomeAssistantAPI {
                     "push_token": pushID,
                 ]
 
-                #if os(iOS)
+                #if os(iOS) && !targetEnvironment(macCatalyst)
                 if #available(iOS 17.2, *) {
                     // Advertise Live Activity support so HA can gate the UI and send
                     // activity push tokens back to the relay server.

Sources/Shared/Environment/Environment.swift

@@ -140,8 +140,7 @@ public class AppEnvironment {
         #endif
     }
 
-    #if os(iOS)
-    #if os(iOS)
+    #if os(iOS) && !targetEnvironment(macCatalyst)
     /// Call `_ = Current.liveActivityRegistry` on the main thread at launch (before any
     /// background thread can access it) to avoid a lazy-init race between concurrent callers.
     public lazy var liveActivityRegistry: LiveActivityRegistryProtocol? = {

Sources/Shared/LiveActivity/HALiveActivityAttributes.swift

@@ -1,4 +1,4 @@
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 import ActivityKit
 import SwiftUI
 

Sources/Shared/LiveActivity/LiveActivityRegistry.swift

@@ -1,4 +1,4 @@
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 import ActivityKit
 import Foundation
 

Sources/Shared/Notifications/NotificationCommands/HandlerLiveActivity.swift

@@ -1,4 +1,4 @@
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 import ActivityKit
 import Foundation
 import PromiseKit

Sources/Shared/Notifications/NotificationCommands/NotificationsCommandManager.swift

@@ -22,7 +22,7 @@ public class NotificationCommandManager {
         register(command: "clear_notification", handler: HandlerClearNotification())
         #if os(iOS)
         register(command: "update_complications", handler: HandlerUpdateComplications())
-        #if os(iOS)
+        #if os(iOS) && !targetEnvironment(macCatalyst)
         if #available(iOS 17.2, *) {
             register(command: "live_activity", handler: HandlerStartOrUpdateLiveActivity())
             register(command: "end_live_activity", handler: HandlerEndLiveActivity())
@@ -111,8 +111,8 @@ private struct HandlerClearNotification: NotificationCommandHandler {
         // Also end any Live Activity whose tag matches — same YAML works on both iOS and Android.
         // Bridged into the returned Promise so the background fetch window stays open until
         // the activity is actually dismissed (prevents the OS suspending mid-dismiss).
-        // ActivityKit is unavailable in the PushProvider extension, so guard accordingly.
-        #if os(iOS)
+        // ActivityKit is unavailable in the PushProvider extension and Mac Catalyst, so guard accordingly.
+        #if os(iOS) && !targetEnvironment(macCatalyst)
         if #available(iOS 17.2, *), !Current.isAppExtension, let tag = payload["tag"] as? String {
             return Promise<Void> { seal in
                 Task {