fix incorrect import of NSApplication in macCatalyst environments

Author: denrase

Sources/Swift/Core/Integrations/FramesTracking/SentryFramesTracker.swift

@@ -4,7 +4,7 @@
 #if (os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT
 import UIKit
 private typealias CrossPlatformApplication = UIApplication
-#elseif (os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT
+#elseif os(macOS)
 import AppKit
 private typealias CrossPlatformApplication = NSApplication
 #endif

Sources/Swift/Core/Integrations/Integrations.swift

@@ -36,11 +36,12 @@ private struct AnyIntegration {
         let dependencies = SentryDependencyContainer.sharedInstance()
 
         var integrations: [AnyIntegration] = [.init(SwiftAsyncIntegration.self)]
+        
         #if os(iOS) && !SENTRY_NO_UIKIT
         integrations.append(.init(UserFeedbackIntegration<SentryDependencyContainer>.self))
         #endif
 
-        #if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || ((os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT)
+        #if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || os(macOS)
         integrations.append(.init(FlushLogsIntegration<SentryDependencyContainer>.self))
         #endif
 

Sources/Swift/Integrations/Log/FlushLogsIntegration.swift

@@ -3,12 +3,12 @@
 #if (os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT
 import UIKit
 private typealias CrossPlatformApplication = UIApplication
-#elseif (os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT
+#elseif os(macOS)
 import AppKit
 private typealias CrossPlatformApplication = NSApplication
 #endif
 
-#if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || ((os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT)
+#if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || os(macOS)
 
 protocol NotificationCenterProvider {
     var notificationCenterWrapper: SentryNSNotificationCenterWrapper { get }

Sources/Swift/Integrations/Session/SessionTracker.swift

@@ -3,7 +3,7 @@
 #if (os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT
 import UIKit
 typealias Application = UIApplication
-#elseif (os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT
+#elseif os(macOS)
 import AppKit
 typealias Application = NSApplication
 #endif
@@ -50,7 +50,7 @@ typealias Application = NSApplication
         // WillTerminate is called no matter if started from the background or launched into the
         // foreground.
 
-    #if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || ((os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT)
+    #if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || os(macOS)
 
         // Call before subscribing to the notifications to avoid that didBecomeActive gets called before
         // ending the cached session.
@@ -84,7 +84,7 @@ typealias Application = NSApplication
     }
 
     @objc public func removeObservers() {
-#if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || ((os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT)
+#if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || os(macOS)
         // Remove the observers with the most specific detail possible, see
         // https://developer.apple.com/documentation/foundation/nsnotificationcenter/1413994-removeobserver
         notificationCenter.removeObserver(self, name: Application.didBecomeActiveNotification, object: nil)

Sources/Swift/SentryDependencyContainer.swift

@@ -257,6 +257,6 @@ extension SentryFileManager: SentryFileManagerProtocol { }
 extension SentryDependencyContainer: ScreenshotSourceProvider { }
 #endif
 
-#if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || ((os(macOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT)
+#if ((os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT) || os(macOS)
 extension SentryDependencyContainer: NotificationCenterProvider { }
 #endif