[V5] Use Swift 6 with complete concurrency checking

.github/workflows/smoke-checks.yml

@@ -64,8 +64,9 @@ jobs:
 
   build-xcode15:
     name: Build SDKs (Xcode 15)
-    runs-on: macos-14
-    if: ${{ github.event.inputs.record_snapshots != 'true' }}
+    runs-on: macos-15
+    #if: ${{ github.event.inputs.record_snapshots != 'true' }}
+    if: false
     env:
       XCODE_VERSION: "15.4"
     steps:

.swiftformat

@@ -1,6 +1,6 @@
 # Stream rules
 --header "\nCopyright © {year} Stream.io Inc. All rights reserved.\n"
---swiftversion 5.9
+--swiftversion 6.0
 
 --ifdef no-indent
 --disable redundantType

.swiftlint.yml

@@ -43,14 +43,10 @@ only_rules:
   - trailing_comma
   - trailing_newline
   - trailing_semicolon
-  - trailing_whitespace
   - unneeded_break_in_switch
   - unneeded_override
   - unused_closure_parameter
   - unused_control_flow_label
   - unused_import
   - vertical_whitespace
   - void_return
-
-trailing_whitespace:
-  ignores_empty_lines: true

DemoAppSwiftUI/AppConfiguration/AppConfiguration.swift

@@ -7,7 +7,7 @@ import StreamChat
 import StreamChatSwiftUI
 
 final class AppConfiguration {
-    static let `default` = AppConfiguration()
+    @MainActor static let `default` = AppConfiguration()
 
     /// The translation language to set on connect.
     var translationLanguage: TranslationLanguage?

DemoAppSwiftUI/AppConfiguration/AppConfigurationTranslationView.swift

@@ -8,23 +8,17 @@ import SwiftUI
 struct AppConfigurationTranslationView: View {
     @Environment(\.dismiss) var dismiss
 
-    var selection: Binding<TranslationLanguage?> = Binding {
-        AppConfiguration.default.translationLanguage
-    } set: { newValue in
-        AppConfiguration.default.translationLanguage = newValue
-    }
-
     var body: some View {
         List {
             ForEach(TranslationLanguage.all, id: \.languageCode) { language in
                 Button(action: {
-                    selection.wrappedValue = language
+                    AppConfiguration.default.translationLanguage = language
                     dismiss()
                 }) {
                     HStack {
                         Text(language.languageCode)
                         Spacer()
-                        if selection.wrappedValue == language {
+                        if AppConfiguration.default.translationLanguage == language {
                             Image(systemName: "checkmark")
                         }
                     }

DemoAppSwiftUI/AppConfiguration/AppConfigurationView.swift

@@ -6,11 +6,7 @@ import Combine
 import SwiftUI
 
 struct AppConfigurationView: View {
-    var channelPinningEnabled: Binding<Bool> = Binding {
-        AppConfiguration.default.isChannelPinningFeatureEnabled
-    } set: { newValue in
-        AppConfiguration.default.isChannelPinningFeatureEnabled = newValue
-    }
+    @State private var channelPinningEnabled = AppConfiguration.default.isChannelPinningFeatureEnabled
 
     var body: some View {
         NavigationView {
@@ -19,12 +15,13 @@ struct AppConfigurationView: View {
                     NavigationLink("Translation") {
                         AppConfigurationTranslationView()
                     }
-                    Toggle("Channel Pinning", isOn: channelPinningEnabled)
+                    Toggle("Channel Pinning", isOn: $channelPinningEnabled)
                 }
             }
             .navigationBarTitleDisplayMode(.inline)
             .navigationTitle("App Configuration")
         }
+        .onChange(of: channelPinningEnabled, perform: { AppConfiguration.default.isChannelPinningFeatureEnabled = $0 })
     }
 }
 

DemoAppSwiftUI/AppleMessageComposerView.swift

@@ -159,7 +159,7 @@ struct AppleMessageComposerView<Factory: ViewFactory>: View, KeyboardReadable {
                     }
                 )
                 .offset(y: -composerHeight)
-                .animation(nil) : nil,
+                .animation(.none, value: viewModel.showCommandsOverlay) : nil,
             alignment: .bottom
         )
         .modifier(factory.makeComposerViewModifier())
@@ -213,7 +213,7 @@ struct BlurredBackground: View {
 }
 
 struct HeightPreferenceKey: PreferenceKey {
-    static var defaultValue: CGFloat?
+    static var defaultValue: CGFloat? { nil }
 
     static func reduce(value: inout CGFloat?, nextValue: () -> CGFloat?) {
         value = value ?? nextValue()

DemoAppSwiftUI/ChannelHeader/BlockedUsersViewModel.swift

@@ -6,7 +6,7 @@ import StreamChat
 import StreamChatSwiftUI
 import SwiftUI
 
-class BlockedUsersViewModel: ObservableObject {
+@MainActor class BlockedUsersViewModel: ObservableObject {
     @Injected(\.chatClient) var chatClient
 
     @Published var blockedUsers = [ChatUser]()

DemoAppSwiftUI/ChannelHeader/ChooseChannelQueryView.swift

@@ -7,7 +7,9 @@ import StreamChatSwiftUI
 import SwiftUI
 
 struct ChooseChannelQueryView: View {
-    static let queryIdentifiers = ChannelListQueryIdentifier.allCases.sorted(using: KeyPathComparator(\.title))
+    static var queryIdentifiers: [ChannelListQueryIdentifier] {
+        ChannelListQueryIdentifier.allCases.sorted(by: { $0.title < $1.title })
+    }
 
     var body: some View {
         ForEach(Self.queryIdentifiers) { queryIdentifier in

DemoAppSwiftUI/ChannelHeader/NewChatViewModel.swift

@@ -6,7 +6,7 @@ import StreamChat
 import StreamChatSwiftUI
 import SwiftUI
 
-class NewChatViewModel: ObservableObject, ChatUserSearchControllerDelegate {
+@MainActor class NewChatViewModel: ObservableObject, ChatUserSearchControllerDelegate {
     @Injected(\.chatClient) var chatClient
 
     @Published var searchText: String = "" {

DemoAppSwiftUI/CreateGroupView.swift

@@ -172,7 +172,7 @@ struct SearchBar: View {
                 }
                 .padding(.trailing, 10)
                 .transition(.move(edge: .trailing))
-                .animation(.default)
+                .animation(.default, value: isEditing)
             }
         }
     }

DemoAppSwiftUI/CreateGroupViewModel.swift

@@ -6,7 +6,7 @@ import StreamChat
 import StreamChatSwiftUI
 import SwiftUI
 
-class CreateGroupViewModel: ObservableObject, ChatUserSearchControllerDelegate {
+@MainActor class CreateGroupViewModel: ObservableObject, ChatUserSearchControllerDelegate {
     @Injected(\.chatClient) var chatClient
 
     var channelController: ChatChannelController!

DemoAppSwiftUI/DemoAppSwiftUIApp.swift

@@ -71,7 +71,7 @@ struct DemoAppSwiftUIApp: App {
     }
 }
 
-class AppState: ObservableObject, CurrentChatUserControllerDelegate {
+@MainActor class AppState: ObservableObject, CurrentChatUserControllerDelegate {
     @Injected(\.chatClient) var chatClient: ChatClient
 
     // Recreate the content view when channel query changes.

DemoAppSwiftUI/DemoUser.swift

@@ -8,7 +8,7 @@ public let apiKeyString = "zcgvnykxsfm8"
 public let applicationGroupIdentifier = "group.io.getstream.iOS.ChatDemoAppSwiftUI"
 public let currentUserIdRegisteredForPush = "currentUserIdRegisteredForPush"
 
-public struct UserCredentials: Codable {
+public struct UserCredentials: Codable, Sendable {
     public let id: String
     public let name: String
     public let avatarURL: URL?

DemoAppSwiftUI/LaunchAnimationState.swift

@@ -4,7 +4,7 @@
 
 import SwiftUI
 
-class LaunchAnimationState: ObservableObject {
+@MainActor class LaunchAnimationState: ObservableObject {
     @Published var showAnimation = true
 
     init() {

DemoAppSwiftUI/LoginView.swift

@@ -37,7 +37,6 @@ struct LoginView: View {
                     DemoUserView(user: user)
                 }
                 .padding(.vertical, 4)
-                .animation(nil)
             }
             .listStyle(.plain)
 

DemoAppSwiftUI/LoginViewModel.swift

@@ -6,7 +6,7 @@ import StreamChat
 import StreamChatSwiftUI
 import SwiftUI
 
-class LoginViewModel: ObservableObject {
+@MainActor class LoginViewModel: ObservableObject {
     @Published var demoUsers = UserCredentials.builtInUsers
     @Published var loading = false
     @Published var showsConfiguration = false
@@ -40,13 +40,10 @@ class LoginViewModel: ObservableObject {
                 log.error("connecting the user failed \(error)")
                 return
             }
-
-            DispatchQueue.main.async { [weak self] in
-                withAnimation {
-                    self?.loading = false
-                    UnsecureRepository.shared.save(user: credentials)
-                    AppState.shared.userState = .loggedIn
-                }
+            withAnimation {
+                self?.loading = false
+                UnsecureRepository.shared.save(user: credentials)
+                AppState.shared.userState = .loggedIn
             }
         }
     }
@@ -62,12 +59,9 @@ class LoginViewModel: ObservableObject {
                 log.error("connecting the user failed \(error)")
                 return
             }
-
-            DispatchQueue.main.async { [weak self] in
-                withAnimation {
-                    self?.loading = false
-                    AppState.shared.userState = .loggedIn
-                }
+            withAnimation {
+                self?.loading = false
+                AppState.shared.userState = .loggedIn
             }
         }
     }

DemoAppSwiftUI/NotificationsHandler.swift

@@ -10,7 +10,7 @@ import UIKit
 /// Handles push notifications in the demo app.
 /// When a notification is received, the channel id is extracted from the notification object.
 /// The code below shows an example how to use it to navigate directly to the corresponding screen.
-class NotificationsHandler: NSObject, ObservableObject, UNUserNotificationCenterDelegate {
+@MainActor class NotificationsHandler: NSObject, ObservableObject, UNUserNotificationCenterDelegate {
     @Injected(\.chatClient) private var chatClient
 
     @Published var notificationChannelId: String?
@@ -19,7 +19,7 @@ class NotificationsHandler: NSObject, ObservableObject, UNUserNotificationCenter
 
     override private init() {}
 
-    func userNotificationCenter(
+    nonisolated func userNotificationCenter(
         _ center: UNUserNotificationCenter,
         didReceive response: UNNotificationResponse,
         withCompletionHandler completionHandler: @escaping () -> Void
@@ -40,25 +40,28 @@ class NotificationsHandler: NSObject, ObservableObject, UNUserNotificationCenter
             return
         }
 
-        if AppState.shared.userState == .loggedIn {
-            notificationChannelId = cid.description
-        } else if let userId = UserDefaults(suiteName: applicationGroupIdentifier)?.string(forKey: currentUserIdRegisteredForPush),
-                  let userCredentials = UserCredentials.builtInUsersByID(id: userId),
-                  let token = try? Token(rawValue: userCredentials.token) {
-            loginAndNavigateToChannel(
-                userCredentials: userCredentials,
-                token: token,
-                cid: cid
-            )
+        Task { @MainActor in
+            if AppState.shared.userState == .loggedIn {
+                notificationChannelId = cid.description
+            } else if
+                let userId = UserDefaults(suiteName: applicationGroupIdentifier)?.string(forKey: currentUserIdRegisteredForPush),
+                let userCredentials = UserCredentials.builtInUsersByID(id: userId),
+                let token = try? Token(rawValue: userCredentials.token) {
+                loginAndNavigateToChannel(
+                    userCredentials: userCredentials,
+                    token: token,
+                    cid: cid
+                )
+            }
         }
     }
 
     func setupRemoteNotifications() {
         UNUserNotificationCenter
             .current()
-            .requestAuthorization(options: [.alert, .sound, .badge]) { granted, _ in
+            .requestAuthorization(options: [.alert, .sound, .badge]) { @Sendable granted, _ in
                 if granted {
-                    DispatchQueue.main.async {
+                    Task { @MainActor in
                         UIApplication.shared.registerForRemoteNotifications()
                     }
                 }
@@ -80,11 +83,8 @@ class NotificationsHandler: NSObject, ObservableObject, UNUserNotificationCenter
                 log.debug("Error logging in")
                 return
             }
-
-            DispatchQueue.main.async {
-                AppState.shared.userState = .loggedIn
-                self?.notificationChannelId = cid.description
-            }
+            AppState.shared.userState = .loggedIn
+            self?.notificationChannelId = cid.description
         }
     }
 }

DemoAppSwiftUI/UserRepository.swift

@@ -33,7 +33,7 @@ final class UnsecureRepository: UserRepository {
         defaults.object(forKey: key.rawValue) as? T
     }
 
-    static let shared = UnsecureRepository()
+    @MainActor static let shared = UnsecureRepository()
 
     func save(user: UserCredentials) {
         let encoder = JSONEncoder()

DemoAppSwiftUI/ViewFactoryExamples.swift

@@ -91,21 +91,23 @@ class DemoAppFactory: ViewFactory {
             iconName: "archivebox",
             action: { [weak self] in
                 guard let self else { return }
+                nonisolated(unsafe) let unsafeOnDismiss = onDismiss
+                nonisolated(unsafe) let unsafeOnError = onError
                 let channelController = self.chatClient.channelController(for: channel.cid)
                 if channel.isArchived {
                     channelController.unarchive { error in
                         if let error = error {
-                            onError(error)
+                            unsafeOnError(error)
                         } else {
-                            onDismiss()
+                            unsafeOnDismiss()
                         }
                     }
                 } else {
                     channelController.archive { error in
                         if let error = error {
-                            onError(error)
+                            unsafeOnError(error)
                         } else {
-                            onDismiss()
+                            unsafeOnDismiss()
                         }
                     }
                 }
@@ -125,21 +127,23 @@ class DemoAppFactory: ViewFactory {
             iconName: "pin.fill",
             action: { [weak self] in
                 guard let self else { return }
+                nonisolated(unsafe) let unsafeOnDismiss = onDismiss
+                nonisolated(unsafe) let unsafeOnError = onError
                 let channelController = self.chatClient.channelController(for: channel.cid)
                 if channel.isPinned {
                     channelController.unpin { error in
                         if let error = error {
-                            onError(error)
+                            unsafeOnError(error)
                         } else {
-                            onDismiss()
+                            unsafeOnDismiss()
                         }
                     }
                 } else {
                     channelController.pin { error in
                         if let error = error {
-                            onError(error)
+                            unsafeOnError(error)
                         } else {
-                            onDismiss()
+                            unsafeOnDismiss()
                         }
                     }
                 }
@@ -266,14 +270,15 @@ class CustomFactory: ViewFactory {
             onDismiss: onDismiss,
             onError: onError
         )
-
-        let freeze = {
+        nonisolated(unsafe) let unsafeOnDismiss = onDismiss
+        nonisolated(unsafe) let unsafeOnError = onError
+        let freeze: @MainActor @Sendable() -> Void = {
             let controller = self.chatClient.channelController(for: channel.cid)
             controller.freezeChannel { error in
                 if let error = error {
-                    onError(error)
+                    unsafeOnError(error)
                 } else {
-                    onDismiss()
+                    unsafeOnDismiss()
                 }
             }
         }