Remove tvOS 14 support

kean · kean · commit da0aa339e45b · 2023-04-29T18:36:58.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## WIP
 
 - `ConsoleView` no longer supports iOS 14, but the packge can still be installed in projects that require iOS 14
+- Increase minimum deployment target on tvOS 14.0 → 15.0
 
 ## Pulse 3.7.0
 
diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ let package = Package(
     name: "Pulse",
     platforms: [
         .iOS(.v14),
-        .tvOS(.v14),
+        .tvOS(.v15),
         .macOS(.v12),
         .watchOS(.v8)
     ],
diff --git a/Pulse.xcodeproj/project.pbxproj b/Pulse.xcodeproj/project.pbxproj
@@ -2484,7 +2484,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				TVOS_DEPLOYMENT_TARGET = 14.0;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Debug;
@@ -2534,7 +2534,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TVOS_DEPLOYMENT_TARGET = 14.0;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 				VALIDATE_PRODUCT = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
diff --git a/README.md b/README.md
@@ -34,8 +34,8 @@ The best way to start using Pulse is with the [**Getting Started**](https://kean
 
 | Pulse      | Swift     | Xcode       | Platforms                                    |
 |------------|-----------|-------------|----------------------------------------------|
+| Pulse 4.0  | Swift 5.7 | Xcode 14.1  | iOS 14.0, tvOS 15.0, watchOS 8.0, macOS 12.0 |
 | Pulse 3.0  | Swift 5.7 | Xcode 14.1  | iOS 14.0, tvOS 14.0, watchOS 8.0, macOS 12.0 |
-| Pulse 2.0  | Swift 5.6 | Xcode 13.3  | iOS 13.0, tvOS 13.0, watchOS 7.0, macOS 11.0 |
 
 ## License
 
diff --git a/Sources/PulseUI/Extensions/Foundation+Extensions.swift b/Sources/PulseUI/Extensions/Foundation+Extensions.swift
@@ -16,7 +16,7 @@ extension Character {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 extension AttributedString {
     init(_ string: String, _ configure: (inout AttributeContainer) -> Void) {
         var attributes = AttributeContainer()
diff --git a/Sources/PulseUI/Features/Console/ConsoleView-tvos.swift b/Sources/PulseUI/Features/Console/ConsoleView-tvos.swift
@@ -2,13 +2,13 @@
 //
 // Copyright (c) 2020–2023 Alexander Grebenyuk (github.com/kean).
 
+#if os(tvOS)
+
 import SwiftUI
 import CoreData
 import Pulse
 import Combine
 
-#if os(tvOS)
-
 public struct ConsoleView: View {
     @StateObject private var environment: ConsoleEnvironment
     @StateObject private var listViewModel: ConsoleListViewModel
@@ -22,7 +22,7 @@ public struct ConsoleView: View {
         GeometryReader { proxy in
             HStack {
                 List {
-                    ConsoleListContentView(viewModel: listViewModel)
+                    ConsoleListContentView()
                 }
 
                 // TODO: Not sure it's valid
@@ -38,6 +38,7 @@ public struct ConsoleView: View {
             .onDisappear { listViewModel.isViewVisible = false }
         }
         .injecting(environment)
+        .environmentObject(listViewModel)
     }
 }
 
diff --git a/Sources/PulseUI/Features/Console/ConsoleView-watchos.swift b/Sources/PulseUI/Features/Console/ConsoleView-watchos.swift
@@ -19,7 +19,7 @@ public struct ConsoleView: View {
     public var body: some View {
         List {
             ConsoleToolbarView(environment: environment)
-            ConsoleListContentView(viewModel: listViewModel)
+            ConsoleListContentView()
         }
         .navigationTitle(environment.title)
         .onAppear { listViewModel.isViewVisible = true }
@@ -32,6 +32,7 @@ public struct ConsoleView: View {
             }
         }
         .injecting(environment)
+        .environmentObject(listViewModel)
     }
 }
 
diff --git a/Sources/PulseUI/Features/Console/List/ConsoleListPinsSectionView.swift b/Sources/PulseUI/Features/Console/List/ConsoleListPinsSectionView.swift
@@ -9,7 +9,7 @@ import Pulse
 import Combine
 import SwiftUI
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleListPinsSectionView: View {
     @ObservedObject var viewModel: ConsoleListViewModel
 
diff --git a/Sources/PulseUI/Features/Console/Views/ConsoleEntityCell.swift b/Sources/PulseUI/Features/Console/Views/ConsoleEntityCell.swift
@@ -129,7 +129,7 @@ private struct _ConsoleTaskCell: View {
 }
 
 #if os(iOS) || os(macOS)
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 private struct ConsoleMessageCellPreview: View {
     let message: LoggerMessageEntity
 
@@ -140,7 +140,7 @@ private struct ConsoleMessageCellPreview: View {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 private struct ConsoleTaskCellPreview: View {
     let task: NetworkTaskEntity
 
@@ -151,7 +151,7 @@ private struct ConsoleTaskCellPreview: View {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 private struct TextViewPreview: View {
     let string: NSAttributedString
 
diff --git a/Sources/PulseUI/Features/Console/Views/ConsoleMessageCell.swift b/Sources/PulseUI/Features/Console/Views/ConsoleMessageCell.swift
@@ -7,7 +7,7 @@ import Pulse
 import CoreData
 import Combine
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleMessageCell: View {
     let message: LoggerMessageEntity
     var isDisclosureNeeded = false
@@ -115,7 +115,7 @@ extension Color {
 }
 
 #if DEBUG
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleMessageCell_Previews: PreviewProvider {
     static var previews: some View {
         ConsoleMessageCell(message: try! LoggerStore.mock.allMessages()[0])
diff --git a/Sources/PulseUI/Features/Console/Views/ConsoleTaskCell.swift b/Sources/PulseUI/Features/Console/Views/ConsoleTaskCell.swift
@@ -7,7 +7,7 @@ import Pulse
 import Combine
 import CoreData
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleTaskCell: View {
     @ObservedObject var task: NetworkTaskEntity
     var isDisclosureNeeded: Bool
@@ -162,7 +162,7 @@ private struct ConsoleProgressText: View {
 }
 
 #if DEBUG
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleTaskCell_Previews: PreviewProvider {
     static var previews: some View {
         ConsoleTaskCell(task: LoggerStore.preview.entity(for: .login))
diff --git a/Sources/PulseUI/Features/Filters/Views/ConsoleDomainsSelectionView.swift b/Sources/PulseUI/Features/Filters/Views/ConsoleDomainsSelectionView.swift
@@ -6,7 +6,7 @@ import SwiftUI
 import Pulse
 import Combine
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleDomainsSelectionView: View {
     @ObservedObject var viewModel: ConsoleFiltersViewModel
     @EnvironmentObject private var index: LoggerStoreIndex
diff --git a/Sources/PulseUI/Features/Filters/Views/ConsoleLabelsSelectionView.swift b/Sources/PulseUI/Features/Filters/Views/ConsoleLabelsSelectionView.swift
@@ -6,7 +6,7 @@ import SwiftUI
 import Pulse
 import Combine
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleLabelsSelectionView: View {
     @ObservedObject var viewModel: ConsoleFiltersViewModel
     @EnvironmentObject private var index: LoggerStoreIndex
diff --git a/Sources/PulseUI/Features/Filters/Views/ConsoleSearchListSelectionView.swift b/Sources/PulseUI/Features/Filters/Views/ConsoleSearchListSelectionView.swift
@@ -5,7 +5,7 @@
 import SwiftUI
 import Pulse
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchListSelectionView<Data: RandomAccessCollection, ID: Hashable, Label: View>: View {
     let title: String
     let items: Data
@@ -148,15 +148,15 @@ struct ConsoleSearchListCell: View {
 }
 
 #if DEBUG
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchListSelectionView_Previews: PreviewProvider {
     static var previews: some View {
         ConsoleSearchListSelectionViewDemo()
             .frame(width: 320)
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 private struct ConsoleSearchListSelectionViewDemo: View {
     @State private var selection: Set<String>  = []
 
diff --git a/Sources/PulseUI/Features/Metrics/NetworkInspectorTransactionView.swift b/Sources/PulseUI/Features/Metrics/NetworkInspectorTransactionView.swift
@@ -25,15 +25,15 @@ struct NetworkInspectorTransactionView: View {
         NavigationLink(destination: destintionTransactionDetails) {
             VStack(alignment: .leading, spacing: 4) {
                 Text(viewModel.title)
-                if #available(iOS 15, tvOS 15, *), let size = viewModel.transferSizeViewModel {
+                if #available(iOS 15, *), let size = viewModel.transferSizeViewModel {
                     transferSizeView(size: size)
                 }
             }
         }
         NetworkRequestInfoCell(viewModel: viewModel.requestViewModel)
     }
     
-    @available(iOS 15, tvOS 15, *)
+    @available(iOS 15, *)
     private func transferSizeView(size: NetworkInspectorTransferInfoViewModel) -> some View {
         let font = TextHelper().font(style: .init(role: .subheadline, style: .monospacedDigital, width: .condensed))
         return (Text(Image(systemName: "arrow.down.circle")) +
diff --git a/Sources/PulseUI/Features/Search/ConsoleSearchViewModel.swift b/Sources/PulseUI/Features/Search/ConsoleSearchViewModel.swift
@@ -341,7 +341,7 @@ final class ConsoleSearchViewModel: ObservableObject, ConsoleSearchOperationDele
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchResultViewModel: Identifiable {
     var id: ConsoleSearchResultKey { ConsoleSearchResultKey(id: entity.objectID) }
     let entity: NSManagedObject
diff --git a/Sources/PulseUI/Features/Search/Services/ConsoleSearchOperation.swift b/Sources/PulseUI/Features/Search/Services/ConsoleSearchOperation.swift
@@ -9,13 +9,13 @@ import Pulse
 import CoreData
 import Combine
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 protocol ConsoleSearchOperationDelegate: AnyObject {
     func searchOperation(_ operation: ConsoleSearchOperation, didAddResults results: [ConsoleSearchResultViewModel])
     func searchOperationDidFinish(_ operation: ConsoleSearchOperation, hasMore: Bool)
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 final class ConsoleSearchOperation {
     private let parameters: ConsoleSearchParameters
     private var entities: [NSManagedObject]
@@ -257,7 +257,7 @@ struct ConsoleSearchMatch {
     static let limit = 1000
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 final class ConsoleSearchService {
     private let cache = NSCache<NSManagedObjectID, CachedString>()
 
diff --git a/Sources/PulseUI/Features/Search/Services/ConsoleSearchSuggestionsService.swift b/Sources/PulseUI/Features/Search/Services/ConsoleSearchSuggestionsService.swift
@@ -9,7 +9,7 @@ import Pulse
 import CoreData
 import Combine
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchSuggestionsViewModel {
     let searches: [ConsoleSearchSuggestion]
     let filters: [ConsoleSearchSuggestion]
@@ -37,7 +37,7 @@ struct ConsoleSearchSuggestionsContext {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 final class ConsoleNetworkSearchSuggestionsService {
     let recents: ConsoleSearchRecentSearchesStore
     let mode: ConsoleMode
@@ -143,7 +143,7 @@ final class ConsoleNetworkSearchSuggestionsService {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchSuggestion: Identifiable {
     let id = UUID()
     let text: AttributedString
diff --git a/Sources/PulseUI/Features/Search/Views/ConsoleSearchResultsSectionView.swift b/Sources/PulseUI/Features/Search/Views/ConsoleSearchResultsSectionView.swift
@@ -9,7 +9,7 @@ import Pulse
 import CoreData
 import Combine
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchResultView: View {
     let viewModel: ConsoleSearchResultViewModel
     var limit: Int = 4
@@ -149,7 +149,7 @@ struct ConsoleSearchResultView: View {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchResultDetailsView: View {
     let viewModel: ConsoleSearchResultViewModel
 
@@ -164,7 +164,7 @@ struct ConsoleSearchResultDetailsView: View {
 }
 
 #if os(iOS)
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct PlainListGroupSeparator: View {
     var body: some View {
         Rectangle().foregroundColor(.clear) // DIY separator
@@ -176,7 +176,7 @@ struct PlainListGroupSeparator: View {
 }
 #endif
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct PlainListSectionHeader<Content: View>: View {
     var title: String?
     @ViewBuilder let content: () -> Content
@@ -206,14 +206,14 @@ struct PlainListSectionHeader<Content: View>: View {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 extension PlainListSectionHeader where Content == Text {
     init(title: String) {
         self.init(title: title, content: { Text(title) })
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct PlainListExpandableSectionHeader<Destination: View>: View {
     let title: String
     let count: Int
@@ -242,7 +242,7 @@ struct PlainListExpandableSectionHeader<Destination: View>: View {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct PlainListSeeAllView: View {
     let count: Int
 
@@ -255,7 +255,7 @@ struct PlainListSeeAllView: View {
     }
 }
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct PlainListSectionHeaderSeparator: View {
     let title: String
 
diff --git a/Sources/PulseUI/Features/Search/Views/ConsoleSearchSuggestionView.swift b/Sources/PulseUI/Features/Search/Views/ConsoleSearchSuggestionView.swift
@@ -9,7 +9,7 @@ import Pulse
 import CoreData
 import Combine
 
-@available(iOS 15, tvOS 15, *)
+@available(iOS 15, *)
 struct ConsoleSearchSuggestionView: View {
     let suggestion: ConsoleSearchSuggestion
     let action: () -> Void
diff --git a/Sources/PulseUI/Helpers/Formatters.swift b/Sources/PulseUI/Helpers/Formatters.swift
@@ -92,7 +92,7 @@ enum ConsoleFormatter {
     // MARK: Individual Components
 
     static func time(for date: Date) -> String {
-        if #available(iOS 15, tvOS 15, *) {
+        if #available(iOS 15, *) {
             return ConsoleMessageCell.timeFormatter.string(from: date)
         } else {
             return ""
diff --git a/Sources/PulseUI/Views/RichTextView/RichTextView-watchos.swift b/Sources/PulseUI/Views/RichTextView/RichTextView-watchos.swift

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ extension Character {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-@available(iOS 15, tvOS 15, *)`
	`19`	`+@available(iOS 15, *)`
`20`	`20`	`extension AttributedString {`
`21`	`21`	`init(_ string: String, _ configure: (inout AttributeContainer) -> Void) {`
`22`	`22`	`var attributes = AttributeContainer()`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public struct ConsoleView: View {`
`19`	`19`	`public var body: some View {`
`20`	`20`	`List {`
`21`	`21`	`ConsoleToolbarView(environment: environment)`
`22`		`- ConsoleListContentView(viewModel: listViewModel)`
	`22`	`+ ConsoleListContentView()`
`23`	`23`	`}`
`24`	`24`	`.navigationTitle(environment.title)`
`25`	`25`	`.onAppear { listViewModel.isViewVisible = true }`
`@@ -32,6 +32,7 @@ public struct ConsoleView: View {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`.injecting(environment)`
	`35`	`+ .environmentObject(listViewModel)`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private struct _ConsoleTaskCell: View {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`#if os(iOS) \|\| os(macOS)`
`132`		`-@available(iOS 15, tvOS 15, *)`
	`132`	`+@available(iOS 15, *)`
`133`	`133`	`private struct ConsoleMessageCellPreview: View {`
`134`	`134`	`let message: LoggerMessageEntity`
`135`	`135`
`@@ -140,7 +140,7 @@ private struct ConsoleMessageCellPreview: View {`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`-@available(iOS 15, tvOS 15, *)`
	`143`	`+@available(iOS 15, *)`
`144`	`144`	`private struct ConsoleTaskCellPreview: View {`
`145`	`145`	`let task: NetworkTaskEntity`
`146`	`146`
`@@ -151,7 +151,7 @@ private struct ConsoleTaskCellPreview: View {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`-@available(iOS 15, tvOS 15, *)`
	`154`	`+@available(iOS 15, *)`
`155`	`155`	`private struct TextViewPreview: View {`
`156`	`156`	`let string: NSAttributedString`
`157`	`157`