Add Catalyst support

kean · Sep 11, 2022 · 4d31797 · 4d31797
1 parent 5128084
commit 4d31797
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/Sources/Pulse/Helpers/LoggerSession.swift b/Sources/Pulse/Helpers/LoggerSession.swift
@@ -2,7 +2,7 @@
 //
 // Copyright (c) 2020–2022 Alexander Grebenyuk (github.com/kean).
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 import Foundation
 #else
 @preconcurrency import Foundation

diff --git a/Sources/Pulse/LoggerStore/LoggerStore+Event.swift b/Sources/Pulse/LoggerStore/LoggerStore+Event.swift
@@ -2,7 +2,7 @@
 //
 // Copyright (c) 2020–2022 Alexander Grebenyuk (github.com/kean).
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 import Foundation
 #else
 @preconcurrency import Foundation

diff --git a/Sources/Pulse/LoggerStore/LoggerStore+Info.swift b/Sources/Pulse/LoggerStore/LoggerStore+Info.swift
@@ -2,7 +2,7 @@
 //
 // Copyright (c) 2020–2022 Alexander Grebenyuk (github.com/kean).
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 import Foundation
 #else
 @preconcurrency import Foundation

diff --git a/Sources/Pulse/NetworkLogger/NetworkLogger+Entities.swift b/Sources/Pulse/NetworkLogger/NetworkLogger+Entities.swift
@@ -2,7 +2,7 @@
 //
 // Copyright (c) 2020–2022 Alexander Grebenyuk (github.com/kean).
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 import Foundation
 #else
 @preconcurrency import Foundation

diff --git a/Sources/Pulse/NetworkLogger/NetworkLoggerInsights.swift b/Sources/Pulse/NetworkLogger/NetworkLoggerInsights.swift
@@ -2,7 +2,7 @@
 //
 // Copyright (c) 2020–2022 Alexander Grebenyuk (github.com/kean).
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 import Foundation
 #else
 @preconcurrency import Foundation

diff --git a/Sources/PulseUI/Extensions/SwiftUIExtensions.swift b/Sources/PulseUI/Extensions/SwiftUIExtensions.swift
@@ -172,7 +172,7 @@ extension Backport {
 
     @ViewBuilder
     func contextMenu<M: View, P: View>(@ViewBuilder menuItems: () -> M, @ViewBuilder preview: () -> P) -> some View {
-#if swift(>=5.7) && !os(watchOS)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7) && !os(watchOS)
         if #available(iOS 16.0, tvOS 16.0, macOS 13.0, *) {
             self.content.contextMenu(menuItems: menuItems, preview: preview)
         } else {

diff --git a/Sources/PulseUI/Features/Charts/LoggerStoreSizeChart.swift b/Sources/PulseUI/Features/Charts/LoggerStoreSizeChart.swift
@@ -5,11 +5,11 @@
 import SwiftUI
 import Pulse
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 import Charts
 #endif
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 @available(iOS 16.0, tvOS 16.0, macOS 13.0, watchOS 9.0, *)
 struct LoggerStoreSizeChart: View {
     let info: LoggerStore.Info

diff --git a/Sources/PulseUI/Features/Insights/InsightsView.swift b/Sources/PulseUI/Features/Insights/InsightsView.swift
@@ -8,7 +8,7 @@ import Pulse
 import SwiftUI
 import CoreData
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
 import Charts
 #endif
 
@@ -59,7 +59,7 @@ public struct InsightsView: View {
 
     @ViewBuilder
     private var durationChart: some View {
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
         if #available(iOS 16.0, *) {
             if insights.duration.values.isEmpty {
                 Text("No network requests yet")
@@ -186,7 +186,7 @@ final class InsightsViewModel: ObservableObject {
         return "\(DurationFormatter.string(from: min, isPrecise: false)) – \(DurationFormatter.string(from: max, isPrecise: false))"
     }
 
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
     @available(iOS 16.0, *)
     struct Bar: Identifiable {
         var id: Int { index }

diff --git a/Sources/PulseUI/Features/Settings/StoreDetailsView.swift b/Sources/PulseUI/Features/Settings/StoreDetailsView.swift
@@ -49,7 +49,7 @@ private struct Contents: View {
     @ViewBuilder
     private var form: some View {
         Form {
-#if swift(>=5.7)
+#if !os(macOS) && !targetEnvironment(macCatalyst) && swift(>=5.7)
             if #available(iOS 16.0, tvOS 16.0, macOS 13.0, watchOS 9.0, *), let info = viewModel.info {
                 LoggerStoreSizeChart(info: info, sizeLimit: viewModel.storeSizeLimit)
 #if os(macOS)