Swift 6: complete concurrency checking

.github/workflows/smoke-checks.yml

@@ -66,7 +66,8 @@ jobs:
   build-xcode15:
     name: Build SDKs (Xcode 15)
     runs-on: macos-15
-    if: ${{ github.event.inputs.record_snapshots != 'true' }}
+    #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

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/AppleMessageComposerView.swift

@@ -160,7 +160,7 @@ struct AppleMessageComposerView<Factory: ViewFactory>: View, KeyboardReadable {
                     }
                 )
                 .offset(y: -composerHeight)
-                .animation(nil) : nil,
+                .animation(.none, value: viewModel.showCommandsOverlay) : nil,
             alignment: .bottom
         )
         .modifier(factory.makeComposerViewModifier())
@@ -214,7 +214,7 @@ struct BlurredBackground: View {
 }
 
 struct HeightPreferenceKey: PreferenceKey {
-    static var defaultValue: CGFloat? = nil
+    static let 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
 
@@ -27,8 +27,10 @@ class BlockedUsersViewModel: ObservableObject {
             } else {
                 let controller = chatClient.userController(userId: blockedUserId)
                 controller.synchronize { [weak self] _ in
-                    if let user = controller.user {
-                        self?.blockedUsers.append(user)
+                    Task { @MainActor in
+                        if let user = controller.user {
+                            self?.blockedUsers.append(user)
+                        }
                     }
                 }
             }
@@ -39,8 +41,10 @@ class BlockedUsersViewModel: ObservableObject {
         let unblockController = chatClient.userController(userId: user.id)
         unblockController.unblock { [weak self] error in
             if error == nil {
-                self?.blockedUsers.removeAll { blocked in
-                    blocked.id == user.id
+                Task { @MainActor in
+                    self?.blockedUsers.removeAll { blocked in
+                        blocked.id == user.id
+                    }
                 }
             }
         }

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
 
@@ -99,31 +99,37 @@ class NewChatViewModel: ObservableObject, ChatUserSearchControllerDelegate {
         if !loadingNextUsers {
             loadingNextUsers = true
             searchController.loadNextUsers(limit: 50) { [weak self] _ in
-                guard let self = self else { return }
-                self.chatUsers = self.searchController.userArray
-                self.loadingNextUsers = false
+                Task { @MainActor in
+                    guard let self = self else { return }
+                    self.chatUsers = self.searchController.userArray
+                    self.loadingNextUsers = false
+                }
             }
         }
     }
 
     // MARK: - ChatUserSearchControllerDelegate
 
-    func controller(
+    nonisolated func controller(
         _ controller: ChatUserSearchController,
         didChangeUsers changes: [ListChange<ChatUser>]
     ) {
-        chatUsers = controller.userArray
+        Task { @MainActor in
+            chatUsers = controller.userArray
+        }
     }
 
     // MARK: - private
 
     private func searchUsers(with term: String?) {
         state = .loading
         searchController.search(term: term) { [weak self] error in
-            if error != nil {
-                self?.state = .error
-            } else {
-                self?.state = .loaded
+            Task { @MainActor in
+                if error != nil {
+                    self?.state = .error
+                } else {
+                    self?.state = .loaded
+                }
             }
         }
     }
@@ -137,13 +143,15 @@ class NewChatViewModel: ObservableObject, ChatUserSearchControllerDelegate {
             extraData: [:]
         )
         channelController?.synchronize { [weak self] error in
-            if error != nil {
-                self?.state = .error
-                self?.updatingSelectedUsers = false
-            } else {
-                withAnimation {
-                    self?.state = .channel
+            Task { @MainActor in
+                if error != nil {
+                    self?.state = .error
                     self?.updatingSelectedUsers = false
+                } else {
+                    withAnimation {
+                        self?.state = .channel
+                        self?.updatingSelectedUsers = false
+                    }
                 }
             }
         }

DemoAppSwiftUI/CreateGroupView.swift

@@ -176,7 +176,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
 
@@ -75,10 +75,12 @@ class CreateGroupViewModel: ObservableObject, ChatUserSearchControllerDelegate {
                 members: Set(selectedUsers.map(\.id))
             )
             channelController.synchronize { [weak self] error in
-                if error != nil {
-                    self?.errorShown = true
-                } else {
-                    self?.showGroupConversation = true
+                Task { @MainActor in
+                    if error != nil {
+                        self?.errorShown = true
+                    } else {
+                        self?.showGroupConversation = true
+                    }
                 }
             }
 
@@ -89,22 +91,26 @@ class CreateGroupViewModel: ObservableObject, ChatUserSearchControllerDelegate {
 
     // MARK: - ChatUserSearchControllerDelegate
 
-    func controller(
+    nonisolated func controller(
         _ controller: ChatUserSearchController,
         didChangeUsers changes: [ListChange<ChatUser>]
     ) {
-        chatUsers = controller.userArray
+        Task { @MainActor in
+            chatUsers = controller.userArray
+        }
     }
 
     // MARK: - private
 
     private func searchUsers(with term: String?) {
         state = .loading
         searchController.search(term: term) { [weak self] error in
-            if error != nil {
-                self?.state = .error
-            } else {
-                self?.state = .loaded
+            Task { @MainActor in
+                if error != nil {
+                    self?.state = .error
+                } else {
+                    self?.state = .loaded
+                }
             }
         }
     }

DemoAppSwiftUI/DemoAppSwiftUIApp.swift

@@ -72,7 +72,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.
@@ -123,13 +123,15 @@ class AppState: ObservableObject, CurrentChatUserControllerDelegate {
         contentIdentifier = identifier.rawValue
     }
 
-    func currentUserController(_ controller: CurrentChatUserController, didChangeCurrentUserUnreadCount: UnreadCount) {
-        unreadCount = didChangeCurrentUserUnreadCount
-        let totalUnreadBadge = unreadCount.channels + unreadCount.threads
-        if #available(iOS 16.0, *) {
-            UNUserNotificationCenter.current().setBadgeCount(totalUnreadBadge)
-        } else {
-            UIApplication.shared.applicationIconBadgeNumber = totalUnreadBadge
+    nonisolated func currentUserController(_ controller: CurrentChatUserController, didChangeCurrentUserUnreadCount: UnreadCount) {
+        Task { @MainActor in
+            unreadCount = didChangeCurrentUserUnreadCount
+            let totalUnreadBadge = unreadCount.channels + unreadCount.threads
+            if #available(iOS 16.0, *) {
+                UNUserNotificationCenter.current().setBadgeCount(totalUnreadBadge)
+            } else {
+                UIApplication.shared.applicationIconBadgeNumber = totalUnreadBadge
+            }
         }
     }
 }

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
 

DemoAppSwiftUI/LoginView.swift

@@ -38,7 +38,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
@@ -42,7 +42,7 @@ class LoginViewModel: ObservableObject {
                 return
             }
 
-            DispatchQueue.main.async { [weak self] in
+            Task { @MainActor [weak self] in
                 withAnimation {
                     self?.loading = false
                     UnsecureRepository.shared.save(user: credentials)
@@ -64,7 +64,7 @@ class LoginViewModel: ObservableObject {
                 return
             }
 
-            DispatchQueue.main.async { [weak self] in
+            Task { @MainActor [weak self] in
                 withAnimation {
                     self?.loading = false
                     AppState.shared.userState = .loggedIn