feat: set supported platforms as iOS 16, macOS 13, watchOS 9, and tvOS 16 (#832)

Author: grdsdev

Package.swift

@@ -7,11 +7,11 @@ import PackageDescription
 let package = Package(
   name: "Supabase",
   platforms: [
-    .iOS(.v13),
-    .macCatalyst(.v13),
-    .macOS(.v10_15),
-    .watchOS(.v6),
-    .tvOS(.v13),
+    .iOS(.v16),
+    .macCatalyst(.v16),
+    .macOS(.v13),
+    .watchOS(.v9),
+    .tvOS(.v16),
   ],
   products: [
     .library(name: "Auth", targets: ["Auth"]),

[email protected]

@@ -7,11 +7,11 @@ import PackageDescription
 let package = Package(
   name: "Supabase",
   platforms: [
-    .iOS(.v13),
-    .macCatalyst(.v13),
-    .macOS(.v10_15),
-    .watchOS(.v6),
-    .tvOS(.v13),
+    .iOS(.v16),
+    .macCatalyst(.v16),
+    .macOS(.v13),
+    .watchOS(.v9),
+    .tvOS(.v16),
   ],
   products: [
     .library(name: "Auth", targets: ["Auth"]),

README.md

@@ -10,7 +10,7 @@ Supabase SDK for Swift. Mirrors the design of [supabase-js](https://github.com/s
 ## Usage
 
 ### Requirements
-- iOS 13.0+ / macOS 10.15+ / tvOS 13+ / watchOS 6+ / visionOS 1+
+- iOS 16.0+ / macOS 13+ / tvOS 16+ / watchOS 9+ / visionOS 1+
 - Xcode 15.3+
 - Swift 5.10+
 

Sources/Auth/AuthClient.swift

@@ -702,7 +702,6 @@ public actor AuthClient {
     /// - Note: This method support the PKCE flow.
     /// - Warning: Do not call `start()` on the `ASWebAuthenticationSession` object inside the
     /// `configure` closure, as the method implementation calls it already.
-    @available(watchOS 6.2, tvOS 16.0, *)
     @discardableResult
     public func signInWithOAuth(
       provider: Provider,

Sources/Helpers/Logger/OSLogSupabaseLogger.swift

@@ -23,7 +23,6 @@ import Foundation
   ///   options: .init(global: .init(logger: supabaseLogger))
   /// )
   /// ```
-  @available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
   public struct OSLogSupabaseLogger: SupabaseLogger {
     private let logger: Logger
 

Sources/Helpers/Task+withTimeout.swift

@@ -26,7 +26,7 @@ package func withTimeout<R: Sendable>(
     group.addTask {
       let interval = deadline.timeIntervalSinceNow
       if interval > 0 {
-        try await _clock.sleep(for: interval)
+        try await _clock.sleep(for: .seconds(interval))
       }
       try Task.checkCancellation()
       throw TimeoutError()

Sources/Helpers/_Clock.swift

@@ -9,43 +9,10 @@ import Clocks
 import ConcurrencyExtras
 import Foundation
 
-package protocol _Clock: Sendable {
-  func sleep(for duration: TimeInterval) async throws
-}
-
-@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-extension ContinuousClock: _Clock {
-  package func sleep(for duration: TimeInterval) async throws {
-    try await sleep(for: .seconds(duration))
-  }
-}
-@available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-extension TestClock<Duration>: _Clock {
-  package func sleep(for duration: TimeInterval) async throws {
-    try await sleep(for: .seconds(duration))
-  }
-}
-
-/// `_Clock` used on platforms where ``Clock`` protocol isn't available.
-struct FallbackClock: _Clock {
-  func sleep(for duration: TimeInterval) async throws {
-    try await Task.sleep(nanoseconds: NSEC_PER_SEC * UInt64(duration))
-  }
-}
-
-// Resolves clock instance based on platform availability.
-let _resolveClock: @Sendable () -> any _Clock = {
-  if #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) {
-    ContinuousClock()
-  } else {
-    FallbackClock()
-  }
-}
-
-private let __clock = LockIsolated(_resolveClock())
+private let __clock: LockIsolated<any Clock<Duration>> = LockIsolated(ContinuousClock())
 
 #if DEBUG
-  package var _clock: any _Clock {
+  package var _clock: any Clock<Duration> {
     get {
       __clock.value
     }
@@ -54,7 +21,7 @@ private let __clock = LockIsolated(_resolveClock())
     }
   }
 #else
-  package var _clock: any _Clock {
+  package var _clock: any Clock<Duration> {
     __clock.value
   }
 #endif

Sources/Realtime/RealtimeChannelV2.swift

@@ -137,7 +137,7 @@ public final class RealtimeChannelV2: Sendable, RealtimeChannelProtocol {
           )
 
           do {
-            try await _clock.sleep(for: delay)
+            try await _clock.sleep(for: .seconds(delay))
           } catch {
             // If sleep is cancelled, break out of retry loop
             logger?.debug("Subscription retry cancelled for channel '\(topic)'")

Sources/Realtime/RealtimeClientV2.swift

@@ -187,7 +187,7 @@ public final class RealtimeClientV2: Sendable, RealtimeClientProtocol {
     if status == .disconnected {
       let connectionTask = Task {
         if reconnect {
-          try? await _clock.sleep(for: options.reconnectDelay)
+          try? await _clock.sleep(for: .seconds(options.reconnectDelay))
 
           if Task.isCancelled {
             options.logger?.debug("Reconnect cancelled, returning")
@@ -398,7 +398,7 @@ public final class RealtimeClientV2: Sendable, RealtimeClientProtocol {
   private func startHeartbeating() {
     let heartbeatTask = Task { [weak self, options] in
       while !Task.isCancelled {
-        try? await _clock.sleep(for: options.heartbeatInterval)
+        try? await _clock.sleep(for: .seconds(options.heartbeatInterval))
         if Task.isCancelled {
           break
         }