Support for complete strict concurrency and Swift 6 migration

DemoApp/Sources/AppDelegate.swift

@@ -7,7 +7,7 @@ import StreamVideo
 import SwiftUI
 import UIKit
 
-class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDelegate {
+class AppDelegate: NSObject, UIApplicationDelegate {
 
     @Injected(\.streamVideo) var streamVideo
 
@@ -95,15 +95,16 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
     // MARK: - Private Helpers
 
     private func setUpRemoteNotifications() {
-        UNUserNotificationCenter
-            .current()
-            .requestAuthorization(options: [.alert, .sound, .badge]) { granted, _ in
+        Task { @MainActor in
+            do {
+                let granted = try await UNUserNotificationCenter.current().requestAuthorization()
                 if granted {
-                    DispatchQueue.main.async {
-                        UIApplication.shared.registerForRemoteNotifications()
-                    }
+                    UIApplication.shared.registerForRemoteNotifications()
                 }
+            } catch {
+                log.error("Error requesting authorization: \(error.localizedDescription)")
             }
+        }
     }
 
     private func setUpPerformanceTracking() {
@@ -118,3 +119,9 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
         }
     }
 }
+
+#if swift(>=6.0)
+extension AppDelegate: @preconcurrency UNUserNotificationCenterDelegate {}
+#else
+extension AppDelegate: UNUserNotificationCenterDelegate {}
+#endif

DemoApp/Sources/Components/AppEnvironment.swift

@@ -21,7 +21,7 @@ extension AppEnvironment {
         var isTest: Bool { self == .test }
     }
 
-    static var configuration: Configuration = {
+    static let configuration: Configuration = {
         #if STREAM_RELEASE
         return .release
         #elseif STREAM_E2E_TESTS
@@ -34,7 +34,7 @@ extension AppEnvironment {
 
 extension AppEnvironment {
 
-    indirect enum BaseURL: Debuggable, CaseIterable {
+    indirect enum BaseURL: Debuggable, CaseIterable, Sendable {
         case pronto
         case prontoStaging
         case staging
@@ -99,7 +99,7 @@ extension AppEnvironment {
             }
         }
 
-        static var allCases: [BaseURL] = [
+        static let allCases: [BaseURL] = [
             .pronto,
             .prontoStaging,
             .staging,
@@ -108,7 +108,7 @@ extension AppEnvironment {
         ]
     }
 
-    static var baseURL: BaseURL = {
+    nonisolated(unsafe) static var baseURL: BaseURL = {
         switch configuration {
         case .test:
             return .demo
@@ -126,7 +126,7 @@ extension AppEnvironment {
         case universal = "streamvideo"
     }
 
-    static var appURLScheme: String = { AppURLScheme.universal.rawValue }()
+    static let appURLScheme: String = { AppURLScheme.universal.rawValue }()
 }
 
 extension AppEnvironment {
@@ -137,7 +137,7 @@ extension AppEnvironment {
         var url: URL { URL(string: rawValue)! }
     }
 
-    static var authBaseURL: URL = { AuthBaseURL.universal.url }()
+    static let authBaseURL: URL = { AuthBaseURL.universal.url }()
 }
 
 extension AppEnvironment {
@@ -192,7 +192,7 @@ extension AppEnvironment {
         }
     }
 
-    static var loggedInView: LoggedInView = {
+    nonisolated(unsafe) static var loggedInView: LoggedInView = {
         switch configuration {
         case .test:
             return .detailed
@@ -223,7 +223,7 @@ extension AppEnvironment {
         }
     }
 
-    static var performanceTrackerVisibility: PerformanceTrackerVisibility = {
+    nonisolated(unsafe) static var performanceTrackerVisibility: PerformanceTrackerVisibility = {
         .hidden
     }()
 }
@@ -243,7 +243,7 @@ extension AppEnvironment {
         }
     }
 
-    static var chatIntegration: ChatIntegration = {
+    nonisolated(unsafe) static var chatIntegration: ChatIntegration = {
         .enabled
     }()
 }
@@ -283,7 +283,7 @@ extension AppEnvironment {
         }
     }
 
-    static var supportedDeeplinks: [SupportedDeeplink] = {
+    nonisolated(unsafe) static var supportedDeeplinks: [SupportedDeeplink] = {
         switch configuration {
         case .debug:
             return [.pronto, .demo, .staging, .legacy]
@@ -310,7 +310,7 @@ extension AppEnvironment {
         }
     }
 
-    static var pictureInPictureIntegration: PictureInPictureIntegration = {
+    nonisolated(unsafe) static var pictureInPictureIntegration: PictureInPictureIntegration = {
         .enabled
     }()
 }
@@ -360,7 +360,7 @@ extension AppEnvironment {
         }
     }
 
-    static var tokenExpiration: TokenExpiration = {
+    nonisolated(unsafe) static var tokenExpiration: TokenExpiration = {
         switch configuration {
         case .debug:
             return .oneMinute
@@ -412,7 +412,7 @@ extension AppEnvironment {
         }
     }
 
-    static var callExpiration: CallExpiration = .never
+    nonisolated(unsafe) static var callExpiration: CallExpiration = .never
 }
 
 extension AppEnvironment {
@@ -440,5 +440,5 @@ extension AppEnvironment {
         }
     }
 
-    static var autoLeavePolicy: AutoLeavePolicy = .default
+    nonisolated(unsafe) static var autoLeavePolicy: AutoLeavePolicy = .default
 }

DemoApp/Sources/Components/Chat/DemoChatAdapter.swift

@@ -52,7 +52,7 @@ struct DemoChatAdapter {
 extension DemoChatAdapter {
     /// Returns the current value for the `StreamVideo` instance.
     struct InjectionKey: StreamChatSwiftUI.InjectionKey {
-        static var currentValue: DemoChatAdapter?
+        nonisolated(unsafe) static var currentValue: DemoChatAdapter?
     }
 }
 

DemoApp/Sources/Components/Chat/DemoChatViewFactory.swift

@@ -8,7 +8,8 @@ import StreamChatSwiftUI
 import class StreamVideoSwiftUI.CallViewModel
 import SwiftUI
 
-final class DemoChatViewFactory: ViewFactory {
+@MainActor
+final class DemoChatViewFactory {
 
     @Injected(\.chatClient) var chatClient: ChatClient
 
@@ -33,3 +34,9 @@ final class DemoChatViewFactory: ViewFactory {
         )
     }
 }
+
+#if swift(>=6.0)
+extension DemoChatViewFactory: @preconcurrency ViewFactory {}
+#else
+extension DemoChatViewFactory: ViewFactory {}
+#endif

DemoApp/Sources/Components/Chat/DemoChatViewModel+Injection.swift

@@ -6,7 +6,7 @@ import Foundation
 import StreamVideo
 
 struct DemoChatViewModelInjectionKey: InjectionKey {
-    static var currentValue: DemoChatViewModel?
+    nonisolated(unsafe) static var currentValue: DemoChatViewModel?
 }
 
 extension InjectedValues {

DemoApp/Sources/Components/CodeScanner/CodeScanner.swift

@@ -112,8 +112,7 @@ struct CodeScannerView_Previews: PreviewProvider {
     }
 }
 
-final class ScannerViewController: UIViewController, UINavigationControllerDelegate, AVCaptureMetadataOutputObjectsDelegate,
-    UIAdaptivePresentationControllerDelegate {
+final class ScannerViewController: UIViewController, UINavigationControllerDelegate, UIAdaptivePresentationControllerDelegate {
     private let photoOutput = AVCapturePhotoOutput()
     private var isCapturing = false
     private var handler: ((UIImage) -> Void)?
@@ -214,9 +213,7 @@ final class ScannerViewController: UIViewController, UINavigationControllerDeleg
         reset()
 
         if (captureSession.isRunning == false) {
-            DispatchQueue.global(qos: .userInteractive).async {
-                self.captureSession?.startRunning()
-            }
+            self.captureSession?.startRunning()
         }
     }
 
@@ -322,9 +319,7 @@ final class ScannerViewController: UIViewController, UINavigationControllerDeleg
         super.viewDidDisappear(animated)
 
         if (captureSession?.isRunning == true) {
-            DispatchQueue.global(qos: .userInteractive).async {
-                self.captureSession?.stopRunning()
-            }
+            captureSession?.stopRunning()
         }
 
         NotificationCenter.default.removeObserver(self)
@@ -491,7 +486,14 @@ final class ScannerViewController: UIViewController, UINavigationControllerDeleg
     }
 }
 
-extension ScannerViewController: AVCapturePhotoCaptureDelegate {
+#if swift(>=6.0)
+extension ScannerViewController: @preconcurrency AVCapturePhotoCaptureDelegate,
+    @preconcurrency AVCaptureMetadataOutputObjectsDelegate {}
+#else
+extension ScannerViewController: AVCapturePhotoCaptureDelegate, AVCaptureMetadataOutputObjectsDelegate {}
+#endif
+
+extension ScannerViewController {
 
     func photoOutput(
         _ output: AVCapturePhotoOutput,

DemoApp/Sources/Components/Deeplinks/DeeplinkAdapter.swift

@@ -5,7 +5,7 @@
 import Foundation
 import StreamVideo
 
-struct DeeplinkInfo: Equatable {
+struct DeeplinkInfo: Equatable, Sendable {
     var url: URL?
     var callId: String
     var callType: String

DemoApp/Sources/Components/MemoryLogDestination/LogQueue.swift

@@ -16,7 +16,7 @@ enum LogQueue {
     }
 }
 
-final class Queue<T>: ObservableObject {
+final class Queue<T>: ObservableObject, @unchecked Sendable {
 
     @Published private(set) var elements: [T] = []
     var maxCount: Int { didSet { resizeIfNeeded() } }

DemoApp/Sources/Components/Reactions/ReactionsAdapter.swift

@@ -214,9 +214,15 @@ final class ReactionsAdapter: ObservableObject {
     }
 }
 
+#if swift(>=6.0)
+extension ReactionsAdapter: @preconcurrency InjectionKey {
+    static var currentValue: ReactionsAdapter = .init()
+}
+#else
 extension ReactionsAdapter: InjectionKey {
     static var currentValue: ReactionsAdapter = .init()
 }
+#endif
 
 extension InjectedValues {
     var reactionsAdapter: ReactionsAdapter {

DemoApp/Sources/Components/Router.swift

@@ -13,7 +13,7 @@ import StreamVideoNoiseCancellation
 #endif
 
 @MainActor
-final class Router: ObservableObject {
+final class Router: ObservableObject, @unchecked Sendable {
 
     // MARK: - Properties
 
@@ -234,9 +234,9 @@ final class Router: ObservableObject {
         appState.connectUser()
     }
 
-    private func refreshToken(
+    nonisolated private func refreshToken(
         for userId: String,
-        _ completionHandler: @escaping (Result<UserToken, Error>) -> Void
+        _ completionHandler: @Sendable @escaping (Result<UserToken, Error>) -> Void
     ) {
         Task {
             do {

DemoApp/Sources/Components/SessionTimer/SessionTimer.swift

@@ -48,8 +48,8 @@ import SwiftUI
         }
     }
 
-    private var timer: Timer?
-    private var sessionEndCountdown: Timer?
+    nonisolated(unsafe) private var timer: Timer?
+    nonisolated(unsafe) private var sessionEndCountdown: Timer?
 
     private let alertInterval: TimeInterval
 
@@ -132,8 +132,12 @@ import SwiftUI
         }
     }
 
-    deinit {
+    nonisolated private func cleanup() {
         timer?.invalidate()
         sessionEndCountdown?.invalidate()
     }
+
+    deinit {
+        cleanup()
+    }
 }

DemoApp/Sources/Components/Snapshot/LocalParticipantSnapshotViewModel.swift

@@ -9,7 +9,7 @@ import StreamVideo
 import UIKit
 
 final class LocalParticipantSnapshotViewModel: NSObject, AVCapturePhotoCaptureDelegate,
-    AVCaptureVideoDataOutputSampleBufferDelegate {
+    AVCaptureVideoDataOutputSampleBufferDelegate, @unchecked Sendable {
 
     private actor State {
         private(set) var isCapturingVideoFrame = false
@@ -173,10 +173,15 @@ final class LocalParticipantSnapshotViewModel: NSObject, AVCapturePhotoCaptureDe
 }
 
 /// Provides the default value of the `LocalParticipantSnapshotViewModel` class.
+#if swift(>=6.0)
+struct LocalParticipantSnapshotViewModelKey: @preconcurrency InjectionKey {
+    @MainActor static var currentValue: LocalParticipantSnapshotViewModel = .init()
+}
+#else
 struct LocalParticipantSnapshotViewModelKey: InjectionKey {
-    @MainActor
-    static var currentValue: LocalParticipantSnapshotViewModel = .init()
+    @MainActor static var currentValue: LocalParticipantSnapshotViewModel = .init()
 }
+#endif
 
 extension InjectedValues {
     /// Provides access to the `LocalParticipantSnapshotViewModel` class to the views and view models.

DemoApp/Sources/Components/Snapshot/SnapshotTrigger.swift

@@ -8,7 +8,7 @@ import StreamVideo
 import StreamVideoSwiftUI
 import SwiftUI
 
-final class StreamSnapshotTrigger: SnapshotTriggering {
+final class StreamSnapshotTrigger: SnapshotTriggering, @unchecked Sendable {
     lazy var binding: Binding<Bool> = Binding<Bool>(
         get: { [weak self] in
             self?.currentValueSubject.value ?? false
@@ -30,10 +30,17 @@ final class StreamSnapshotTrigger: SnapshotTriggering {
 }
 
 /// Provides the default value of the `StreamSnapshotTrigger` class.
+#if swift(>=6.0)
+struct StreamSnapshotTriggerKey: @preconcurrency InjectionKey {
+    @MainActor
+    static var currentValue: StreamSnapshotTrigger = .init()
+}
+#else
 struct StreamSnapshotTriggerKey: InjectionKey {
     @MainActor
     static var currentValue: StreamSnapshotTrigger = .init()
 }
+#endif
 
 extension InjectedValues {
     /// Provides access to the `StreamSnapshotTrigger` class to the views and view models.

DemoApp/Sources/Extensions/DemoApp+Sentry.swift

@@ -46,7 +46,7 @@ func configureSentry() {
     }
 }
 
-private final class SentryLogDestination: LogDestination {
+private final class SentryLogDestination: LogDestination, @unchecked Sendable {
     func write(message: String) {
         // TODO: remove me once this function is gone from the protocol
     }