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/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())

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

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

DemoAppSwiftUI/LoginView.swift

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

DemoAppSwiftUI/LoginViewModel.swift

@@ -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

DemoAppSwiftUI/NotificationsHandler.swift

@@ -82,7 +82,7 @@ class NotificationsHandler: NSObject, ObservableObject, UNUserNotificationCenter
                 return
             }
 
-            DispatchQueue.main.async {
+            Task { @MainActor in
                 AppState.shared.userState = .loggedIn
                 self?.notificationChannelId = cid.description
             }

DemoAppSwiftUI/ViewFactoryExamples.swift

@@ -22,8 +22,8 @@ class DemoAppFactory: ViewFactory {
 
     func supportedMoreChannelActions(
         for channel: ChatChannel,
-        onDismiss: @escaping () -> Void,
-        onError: @escaping (Error) -> Void
+        onDismiss: @escaping @Sendable() -> Void,
+        onError: @escaping @Sendable(Error) -> Void
     ) -> [ChannelAction] {
         var actions = ChannelAction.defaultActions(
             for: channel,
@@ -259,8 +259,8 @@ class CustomFactory: ViewFactory {
     // Example for an injected action. Uncomment to see it in action.
     func supportedMoreChannelActions(
         for channel: ChatChannel,
-        onDismiss: @escaping () -> Void,
-        onError: @escaping (Error) -> Void
+        onDismiss: @escaping @Sendable() -> Void,
+        onError: @escaping @Sendable(Error) -> Void
     ) -> [ChannelAction] {
         var defaultActions = ChannelAction.defaultActions(
             for: channel,
@@ -269,7 +269,7 @@ class CustomFactory: ViewFactory {
             onError: onError
         )
 
-        let freeze = {
+        let freeze: @MainActor @Sendable() -> Void = {
             let controller = self.chatClient.channelController(for: channel.cid)
             controller.freezeChannel { error in
                 if let error = error {
@@ -300,8 +300,8 @@ class CustomFactory: ViewFactory {
 
     func makeMoreChannelActionsView(
         for channel: ChatChannel,
-        onDismiss: @escaping () -> Void,
-        onError: @escaping (Error) -> Void
+        onDismiss: @escaping @MainActor() -> Void,
+        onError: @escaping @MainActor(Error) -> Void
     ) -> some View {
         VStack {
             Text("This is our custom view")

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import Foundation
 import PackageDescription

Scripts/removePublicDeclarations.sh

@@ -33,11 +33,6 @@ do
 		replaceDeclaration 'signpost(log' 'signpost(nukeLog' $f
 		replaceDeclaration ' Cache(' ' NukeCache(' $f
 		replaceDeclaration ' Cache<' ' NukeCache<' $f
-		replaceDeclaration ' Image?' ' NukeImage?' $f
-		replaceDeclaration ' Image(' ' NukeImage(' $f
-		replaceDeclaration 'struct Image:' 'struct NukeImage:' $f
-		replaceDeclaration 'extension Image {' 'extension NukeImage {' $f
-		replaceDeclaration 'Content == Image' 'Content == NukeImage' $f
 		replaceDeclaration ' VideoPlayerView' ' NukeVideoPlayerView' $f
 		replaceDeclaration 'typealias Color' 'typealias NukeColor' $f
 		replaceDeclaration 'extension Color' 'extension NukeColor' $f

Sources/StreamChatSwiftUI/Appearance.swift

@@ -21,20 +21,21 @@ public class Appearance {
     }
 
     /// Provider for custom localization which is dependent on App Bundle.
-    public static var localizationProvider: (_ key: String, _ table: String) -> String = { key, table in
+    nonisolated(unsafe)
+    public static var localizationProvider: @Sendable(_ key: String, _ table: String) -> String = { key, table in
         Bundle.streamChatUI.localizedString(forKey: key, value: nil, table: table)
     }
 }
 
 // MARK: - Appearance + Default
 
 public extension Appearance {
-    static var `default`: Appearance = .init()
+    nonisolated(unsafe) static var `default`: Appearance = .init()
 }
 
 /// Provides the default value of the `Appearance` class.
 public struct AppearanceKey: EnvironmentKey {
-    public static let defaultValue: Appearance = Appearance()
+    public static var defaultValue: Appearance { .init() }
 }
 
 extension EnvironmentValues {

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/AddUsersViewModel.swift

@@ -6,7 +6,7 @@ import StreamChat
 import SwiftUI
 
 /// View model for the `AddUsersView`.
-class AddUsersViewModel: ObservableObject {
+@MainActor class AddUsersViewModel: ObservableObject {
 
     @Injected(\.chatClient) private var chatClient
 
@@ -46,9 +46,11 @@ class AddUsersViewModel: ObservableObject {
         if !loadingNextUsers {
             loadingNextUsers = true
             searchController.loadNextUsers { [weak self] _ in
-                guard let self = self else { return }
-                self.users = self.searchController.userArray
-                self.loadingNextUsers = false
+                MainActor.ensureIsolated { [weak self] in
+                    guard let self = self else { return }
+                    self.users = self.searchController.userArray
+                    self.loadingNextUsers = false
+                }
             }
         }
     }
@@ -57,16 +59,20 @@ class AddUsersViewModel: ObservableObject {
         let filter: Filter<UserListFilterScope> = .notIn(.id, values: loadedUserIds)
         let query = UserListQuery(filter: filter)
         searchController.search(query: query) { [weak self] error in
-            guard let self = self, error == nil else { return }
-            self.users = self.searchController.userArray
+            MainActor.ensureIsolated { [weak self] in
+                guard let self = self, error == nil else { return }
+                self.users = self.searchController.userArray
+            }
         }
     }
 
     private func searchUsers(term: String) {
         searchController.search(term: searchText) { [weak self] error in
-            guard let self = self, error == nil else { return }
-            self.users = self.searchController.userArray.filter { user in
-                !self.loadedUserIds.contains(user.id)
+            MainActor.ensureIsolated { [weak self] in
+                guard let self = self, error == nil else { return }
+                self.users = self.searchController.userArray.filter { user in
+                    !self.loadedUserIds.contains(user.id)
+                }
             }
         }
     }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoViewModel.swift

@@ -7,7 +7,7 @@ import StreamChat
 import SwiftUI
 
 // View model for the `ChatChannelInfoView`.
-public class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDelegate {
+@MainActor public class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDelegate {
 
     @Injected(\.chatClient) private var chatClient
 
@@ -172,7 +172,7 @@ public class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDe
         loadAdditionalUsers()
     }
 
-    public func leaveConversationTapped(completion: @escaping () -> Void) {
+    public func leaveConversationTapped(completion: @escaping @MainActor() -> Void) {
         if !channel.isDirectMessageChannel {
             removeUserFromConversation(completion: completion)
         } else {
@@ -195,20 +195,22 @@ public class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDe
         )
     }
 
-    public func channelController(
+    nonisolated public func channelController(
         _ channelController: ChatChannelController,
         didUpdateChannel channel: EntityChange<ChatChannel>
     ) {
-        if let channel = channelController.channel {
-            self.channel = channel
-            if self.channel.lastActiveMembers.count > participants.count {
-                participants = channel.lastActiveMembers.map { member in
-                    ParticipantInfo(
-                        chatUser: member,
-                        displayName: member.name ?? member.id,
-                        onlineInfoText: onlineInfo(for: member),
-                        isDeactivated: member.isDeactivated
-                    )
+        MainActor.ensureIsolated {
+            if let channel = channelController.channel {
+                self.channel = channel
+                if self.channel.lastActiveMembers.count > participants.count {
+                    participants = channel.lastActiveMembers.map { member in
+                        ParticipantInfo(
+                            chatUser: member,
+                            displayName: member.name ?? member.id,
+                            onlineInfoText: onlineInfo(for: member),
+                            isDeactivated: member.isDeactivated
+                        )
+                    }
                 }
             }
         }
@@ -221,23 +223,27 @@ public class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDe
 
     // MARK: - private
 
-    private func removeUserFromConversation(completion: @escaping () -> Void) {
+    private func removeUserFromConversation(completion: @escaping @MainActor() -> Void) {
         guard let userId = chatClient.currentUserId else { return }
         channelController.removeMembers(userIds: [userId]) { [weak self] error in
-            if error != nil {
-                self?.errorShown = true
-            } else {
-                completion()
+            MainActor.ensureIsolated { [weak self] in
+                if error != nil {
+                    self?.errorShown = true
+                } else {
+                    completion()
+                }
             }
         }
     }
 
-    private func deleteChannel(completion: @escaping () -> Void) {
+    private func deleteChannel(completion: @escaping @MainActor() -> Void) {
         channelController.deleteChannel { [weak self] error in
-            if error != nil {
-                self?.errorShown = true
-            } else {
-                completion()
+            MainActor.ensureIsolated { [weak self] in
+                if error != nil {
+                    self?.errorShown = true
+                } else {
+                    completion()
+                }
             }
         }
     }
@@ -249,19 +255,21 @@ public class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDe
 
         loadingUsers = true
         memberListController.loadNextMembers { [weak self] error in
-            guard let self = self else { return }
-            self.loadingUsers = false
-            if error == nil {
-                let newMembers = self.memberListController.members.map { member in
-                    ParticipantInfo(
-                        chatUser: member,
-                        displayName: member.name ?? member.id,
-                        onlineInfoText: self.onlineInfo(for: member),
-                        isDeactivated: member.isDeactivated
-                    )
-                }
-                if newMembers.count > self.participants.count {
-                    self.participants = newMembers
+            MainActor.ensureIsolated { [weak self] in
+                guard let self = self else { return }
+                self.loadingUsers = false
+                if error == nil {
+                    let newMembers = self.memberListController.members.map { member in
+                        ParticipantInfo(
+                            chatUser: member,
+                            displayName: member.name ?? member.id,
+                            onlineInfoText: self.onlineInfo(for: member),
+                            isDeactivated: member.isDeactivated
+                        )
+                    }
+                    if newMembers.count > self.participants.count {
+                        self.participants = newMembers
+                    }
                 }
             }
         }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/FileAttachmentsViewModel.swift

@@ -7,7 +7,7 @@ import StreamChat
 import SwiftUI
 
 /// View model for the `FileAttachmentsView`.
-class FileAttachmentsViewModel: ObservableObject, ChatMessageSearchControllerDelegate {
+@MainActor class FileAttachmentsViewModel: ObservableObject, ChatMessageSearchControllerDelegate {
 
     @Published var loading = false
     @Published var attachmentsDataSource = [MonthlyFileAttachments]()
@@ -68,17 +68,21 @@ class FileAttachmentsViewModel: ObservableObject, ChatMessageSearchControllerDel
         if !loadingNextMessages {
             loadingNextMessages = true
             messageSearchController.loadNextMessages { [weak self] _ in
-                guard let self = self else { return }
-                self.updateAttachments()
-                self.loadingNextMessages = false
+                MainActor.ensureIsolated { [weak self] in
+                    guard let self = self else { return }
+                    self.updateAttachments()
+                    self.loadingNextMessages = false
+                }
             }
         }
     }
 
     // MARK: - ChatMessageSearchControllerDelegate
 
-    func controller(_ controller: ChatMessageSearchController, didChangeMessages changes: [ListChange<ChatMessage>]) {
-        updateAttachments()
+    nonisolated func controller(_ controller: ChatMessageSearchController, didChangeMessages changes: [ListChange<ChatMessage>]) {
+        MainActor.ensureIsolated {
+            updateAttachments()
+        }
     }
 
     private func loadMessages() {
@@ -89,9 +93,11 @@ class FileAttachmentsViewModel: ObservableObject, ChatMessageSearchControllerDel
 
         loading = true
         messageSearchController.search(query: query, completion: { [weak self] _ in
-            guard let self = self else { return }
-            self.updateAttachments()
-            self.loading = false
+            MainActor.ensureIsolated { [weak self] in
+                guard let self = self else { return }
+                self.updateAttachments()
+                self.loading = false
+            }
         })
     }