Merge pull request #112 from getditto/BP/ios_14

Bump minimum iOS version to 14 instead of 11
getditto · May 13, 2024 · 1d26674 · 1d26674
2 parents 4bddd6e + 96864b1
commit 1d26674
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 24 deletions.
diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "DittoSwiftTools",
     platforms: [
-        .iOS(.v11),
+        .iOS(.v14),
         .macOS(.v11),
     ],
     products: [

diff --git a/Sources/DittoDataBrowser/DataBrowser.swift b/Sources/DittoDataBrowser/DataBrowser.swift
@@ -8,7 +8,6 @@
 import SwiftUI
 import DittoSwift
 
-@available(iOS 14.0, *)
 public struct DataBrowser: View {
 
     @StateObject var viewModel: DataBrowserViewModel

diff --git a/Sources/DittoDataBrowser/DataBrowserViewModel.swift b/Sources/DittoDataBrowser/DataBrowserViewModel.swift
@@ -8,7 +8,6 @@
 import SwiftUI
 import DittoSwift
 
-@available(iOS 13.0, *)
 class DataBrowserViewModel: ObservableObject {
 
     @Published var collections: [DittoCollection]?

diff --git a/Sources/DittoDataBrowser/DocumentsViewModel.swift b/Sources/DittoDataBrowser/DocumentsViewModel.swift
@@ -9,7 +9,6 @@ import Foundation
 import DittoSwift
 import OrderedCollections
 
-@available(iOS 13.0, *)
 class DocumentsViewModel : ObservableObject {
 
     let collectionName: String

diff --git a/Sources/DittoDiskUsage/DittoDiskUsageView.swift b/Sources/DittoDiskUsage/DittoDiskUsageView.swift
@@ -24,7 +24,6 @@ fileprivate struct DiskUsageState {
     let error: String?
 }
 
-@available(iOS 14, *)
 class DiskUsageViewModel: ObservableObject {
 
     @Published fileprivate var diskUsage: DiskUsageState?
@@ -85,7 +84,6 @@ class DiskUsageViewModel: ObservableObject {
     }
 }
 
-@available(iOS 14, *)
 public struct DittoDiskUsageView: View {
 
     @Environment(\.presentationMode) var presentationMode
@@ -157,7 +155,6 @@ public struct DittoDiskUsageView: View {
     }
 }
 
-@available(iOS 14, *)
 struct DittoDiskUsageView_Previews: PreviewProvider {
     static var previews: some View {
         DittoDiskUsageView(ditto: Ditto())

diff --git a/Sources/DittoExportData/ExportData.swift b/Sources/DittoExportData/ExportData.swift
@@ -8,8 +8,6 @@ import SwiftUI
 import UIKit
 #endif
 
-
-@available(iOS 13.0, *)
 public struct ExportData: UIViewControllerRepresentable {
 
     private let ditto: Ditto

diff --git a/Sources/DittoExportLogs/ExportLogs.swift b/Sources/DittoExportLogs/ExportLogs.swift
@@ -8,8 +8,6 @@ import SwiftUI
 import UIKit
 #endif
 
-
-@available(iOS 13.0, *)
 public struct ExportLogs: UIViewControllerRepresentable {
 
     public init() {}

diff --git a/Sources/DittoHeartbeat/HeartbeatVM.swift b/Sources/DittoHeartbeat/HeartbeatVM.swift
@@ -15,7 +15,6 @@ import SwiftUI
 
 public typealias HeartbeatCallback = (DittoHeartbeatInfo) -> Void
 
-@available(iOS 13, *)
 public class HeartbeatVM: ObservableObject {
     @Published public var isEnabled = false
     private var hbConfig: DittoHeartbeatConfig?

diff --git a/Sources/DittoPeersList/DittoPeer+Extensions.swift b/Sources/DittoPeersList/DittoPeer+Extensions.swift
@@ -9,7 +9,6 @@ import Foundation
 import DittoSwift
 import CryptoKit
 
-@available(iOS 13.0, *)
 extension DittoPeer {
     var peerSDKVersion: String {
         let sdk = "SDK "

diff --git a/Sources/DittoPermissionsHealth/BluetoothManager.swift b/Sources/DittoPermissionsHealth/BluetoothManager.swift
@@ -10,7 +10,6 @@ import CoreBluetooth
 import DittoHealthMetrics
 import Foundation
 
-@available(iOS 13.0, *)
 public class BluetoothManager: NSObject, ObservableObject {
     private var centralManager: CBCentralManager!
     private var cancellables = Set<AnyCancellable>()
@@ -90,15 +89,13 @@ public class BluetoothManager: NSObject, ObservableObject {
     }
 }
 
-@available(iOS 13.0, *)
 extension BluetoothManager: CBCentralManagerDelegate {
     public func centralManagerDidUpdateState(_ central: CBCentralManager) {
         // This delegate method is called when there's a change in the manager's state.
         // We don't need to do anything here since we're observing the state using Combine.
     }
 }
 
-@available(iOS 13.0, *)
 extension BluetoothManager: HealthMetricProvider {
     public var metricName: String {
         DittoPermissionsHealthConstants.bluetoothManagerHealthMetricName

diff --git a/Sources/DittoPermissionsHealth/NetworkManager.swift b/Sources/DittoPermissionsHealth/NetworkManager.swift
@@ -9,7 +9,6 @@ import Combine
 import DittoHealthMetrics
 import Network
 
-@available(iOS 13.0, *)
 public class NetworkManager: NSObject, ObservableObject {
     @Published var isWifiEnabled = false
 
@@ -30,7 +29,6 @@ public class NetworkManager: NSObject, ObservableObject {
     }
 }
 
-@available(iOS 13.0, *)
 extension NetworkManager: HealthMetricProvider {
     public var metricName: String {
         DittoPermissionsHealthConstants.networkManagerHealthMetricName

diff --git a/Sources/DittoPermissionsHealth/PermissionsHealth.swift b/Sources/DittoPermissionsHealth/PermissionsHealth.swift
@@ -8,7 +8,6 @@
 import SwiftUI
 import Combine
 
-@available(iOS 14.0, *)
 public struct PermissionsHealth: View {
     @ObservedObject var bluetoothManager = BluetoothManager()
     @ObservedObject var networkManager = NetworkManager()

diff --git a/Sources/DittoPresenceDegradation/NewSessionView.swift b/Sources/DittoPresenceDegradation/NewSessionView.swift
@@ -7,7 +7,6 @@
 
 import SwiftUI
 
-@available(iOS 14.0, *)
 public struct NewSessionView: View {
 
     @Binding private var expectedPeers: Int

diff --git a/Sources/DittoPresenceDegradation/PresenceDegradationVM.swift b/Sources/DittoPresenceDegradation/PresenceDegradationVM.swift
@@ -10,7 +10,6 @@ import DittoSwift
 import CryptoKit
 import Combine
 
-@available(iOS 13.0, *)
 class PresenceDegradationVM: ObservableObject {
 
     @Published var expectedPeers: Int = 0

diff --git a/Sources/DittoPresenceDegradation/PresenceDegradationView.swift b/Sources/DittoPresenceDegradation/PresenceDegradationView.swift
@@ -8,7 +8,6 @@
 import SwiftUI
 import DittoSwift
 
-@available(iOS 14.0, *)
 public struct PresenceDegradationView: View {
 
     @StateObject var vm: PresenceDegradationVM

diff --git a/Sources/DittoPresenceViewer/PresenceView.swift b/Sources/DittoPresenceViewer/PresenceView.swift
@@ -19,7 +19,7 @@ import UIKit
 import AppKit
 #endif
 
-@available(iOS 13, macOS 10.15, *)
+@available(macOS 10.15, *)
 public struct PresenceView: View {
     public var ditto: Ditto
 
@@ -34,7 +34,6 @@ public struct PresenceView: View {
 
 // MARK: - UIViewRepresentable
 #if os(iOS)
-@available(iOS 13, *)
 extension PresenceView: UIViewRepresentable {
     public typealias Body = Never
     public typealias UIViewType = UIView