Updated StreamChat dependency to 4.65.0 (#625)

nuno-vieira · web-flow · commit 753ef677aed7 · 2024-10-18T15:52:06.000+01:00
* Updated StreamChat dependency to 4.65.0

* Format code according to swiftformat

* Fix Tests

* One more

* Fix demo app linting
diff --git a/DemoAppSwiftUI/DemoAppSwiftUIApp.swift b/DemoAppSwiftUI/DemoAppSwiftUIApp.swift
@@ -27,14 +27,14 @@ struct DemoAppSwiftUIApp: App {
             case .notLoggedIn:
                 LoginView()
             case .loggedIn:
-                    TabView {
-                        channelListView()
-                            .tabItem { Label("Chat", systemImage: "message") }
-                            .badge(appState.unreadCount.channels)
-                        threadListView()
-                            .tabItem { Label("Threads", systemImage: "text.bubble") }
-                            .badge(appState.unreadCount.threads)
-                    }
+                TabView {
+                    channelListView()
+                        .tabItem { Label("Chat", systemImage: "message") }
+                        .badge(appState.unreadCount.channels)
+                    threadListView()
+                        .tabItem { Label("Threads", systemImage: "text.bubble") }
+                        .badge(appState.unreadCount.threads)
+                }
             }
         }
         .onChange(of: appState.userState) { newValue in
@@ -104,7 +104,7 @@ class AppState: ObservableObject, CurrentChatUserControllerDelegate {
     private init() {}
 
     func currentUserController(_ controller: CurrentChatUserController, didChangeCurrentUserUnreadCount: UnreadCount) {
-        self.unreadCount = didChangeCurrentUserUnreadCount
+        unreadCount = didChangeCurrentUserUnreadCount
         let totalUnreadBadge = unreadCount.channels + unreadCount.threads
         if #available(iOS 16.0, *) {
             UNUserNotificationCenter.current().setBadgeCount(totalUnreadBadge)
diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.64.0"),
+        .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.65.0"),
     ],
     targets: [
         .target(
diff --git a/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListView.swift b/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListView.swift
@@ -81,22 +81,22 @@ public struct ChatChannelListView<Factory: ViewFactory>: View {
             view.navigationViewStyle(.stack)
         })
         .background(
-           isIphone && handleTabBarVisibility ?
-               Color.clear.background(
-                   TabBarAccessor { tabBar in
-                       self.tabBar = tabBar
-                   }
-               )
-               .allowsHitTesting(false)
-               : nil
-       )
-       .onReceive(viewModel.$hideTabBar) { newValue in
-           if isIphone && handleTabBarVisibility {
-               self.setupTabBarAppeareance()
-               self.tabBar?.isHidden = newValue
-           }
-       }
-       .accessibilityIdentifier("ChatChannelListView")
+            isIphone && handleTabBarVisibility ?
+                Color.clear.background(
+                    TabBarAccessor { tabBar in
+                        self.tabBar = tabBar
+                    }
+                )
+                .allowsHitTesting(false)
+                : nil
+        )
+        .onReceive(viewModel.$hideTabBar) { newValue in
+            if isIphone && handleTabBarVisibility {
+                self.setupTabBarAppeareance()
+                self.tabBar?.isHidden = newValue
+            }
+        }
+        .accessibilityIdentifier("ChatChannelListView")
     }
 
     @ViewBuilder
diff --git a/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadList.swift b/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadList.swift
@@ -35,7 +35,7 @@ public struct ThreadList<Factory: ViewFactory, HeaderView: View, FooterView: Vie
         self.factory = factory
         self.threads = threads
         self.threadDestination = threadDestination
-        self._selectedThread = selectedThread
+        _selectedThread = selectedThread
         self.onItemTap = onItemTap
         self.onItemAppear = onItemAppear
         self.headerView = headerView
@@ -49,7 +49,7 @@ public struct ThreadList<Factory: ViewFactory, HeaderView: View, FooterView: Vie
                 factory: factory,
                 threads: threads,
                 threadDestination: threadDestination,
-                selectedThread: $selectedThread, 
+                selectedThread: $selectedThread,
                 onItemTap: onItemTap,
                 onItemAppear: onItemAppear
             )
@@ -82,7 +82,7 @@ public struct ThreadsLazyVStack<Factory: ViewFactory>: View {
         self.threadDestination = threadDestination
         self.onItemTap = onItemTap
         self.onItemAppear = onItemAppear
-        self._selectedThread = selectedThread
+        _selectedThread = selectedThread
     }
 
     public var body: some View {
@@ -93,9 +93,11 @@ public struct ThreadsLazyVStack<Factory: ViewFactory>: View {
                     threadDestination: threadDestination,
                     selectedThread: $selectedThread
                 )
-                .background(factory.makeThreadListItemBackground(
-                    thread: thread,
-                    isSelected: selectedThread?.id == thread.id)
+                .background(
+                    factory.makeThreadListItemBackground(
+                        thread: thread,
+                        isSelected: selectedThread?.id == thread.id
+                    )
                 )
                 .contentShape(Rectangle())
                 .onTapGesture {
diff --git a/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListItem.swift b/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListItem.swift
@@ -51,7 +51,7 @@ public struct ChatThreadListItemViewModel {
             parentMessageText = threadTitle
         } else {
             let formatter = InjectedValues[\.utils].messagePreviewFormatter
-            parentMessageText =  formatter.formatContent(for: thread.parentMessage)
+            parentMessageText = formatter.formatContent(for: thread.parentMessage)
         }
         return L10n.Thread.Item.repliedTo(parentMessageText.trimmed)
     }
diff --git a/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListNavigatableItem.swift b/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListNavigatableItem.swift
@@ -24,7 +24,7 @@ public struct ChatThreadListNavigatableItem<ThreadListItem: View, ThreadDestinat
         self.thread = thread
         self.threadListItem = threadListItem
         self.threadDestination = threadDestination
-        self._selectedThread = selectedThread
+        _selectedThread = selectedThread
         self.handleTabBarVisibility = handleTabBarVisibility
     }
 
@@ -55,7 +55,7 @@ public struct ThreadSelectionInfo: Identifiable {
 
     public init(thread: ChatThread) {
         self.thread = thread
-        self.id = thread.id
+        id = thread.id
     }
 }
 
diff --git a/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListView.swift b/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListView.swift
@@ -104,14 +104,14 @@ public struct ChatThreadListContentView<Factory: ViewFactory>: View {
         ThreadList(
             factory: viewFactory,
             threads: viewModel.threads,
-            threadDestination: viewFactory.makeThreadDestination(), 
+            threadDestination: viewFactory.makeThreadDestination(),
             selectedThread: $viewModel.selectedThread,
             onItemTap: { thread in
                 viewModel.selectedThread = .init(thread: thread)
             },
             onItemAppear: { index in
                 viewModel.didAppearThread(at: index)
-            }, 
+            },
             headerView: {
                 viewFactory.makeThreadListHeaderView(viewModel: viewModel)
             },
diff --git a/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListViewModel.swift b/Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadListViewModel.swift
@@ -55,12 +55,12 @@ open class ChatThreadListViewModel: ObservableObject, ChatThreadListControllerDe
     @Published public var hasNewThreads: Bool = false
 
     /// The ids of the new threads available to be fetched.
-   private var newAvailableThreadIds: Set<MessageId> = [] {
-       didSet {
-           newThreadsCount = newAvailableThreadIds.count
-           hasNewThreads = newThreadsCount > 0
-       }
-   }
+    private var newAvailableThreadIds: Set<MessageId> = [] {
+        didSet {
+            newThreadsCount = newAvailableThreadIds.count
+            hasNewThreads = newThreadsCount > 0
+        }
+    }
 
     /// Creates a view model for the `ChatThreadListView`.
     ///
diff --git a/Sources/StreamChatSwiftUI/ChatThreadList/NoThreadsView.swift b/Sources/StreamChatSwiftUI/ChatThreadList/NoThreadsView.swift
@@ -7,7 +7,7 @@ import SwiftUI
 /// Default SDK implementation for the view displayed when there are no threads available.
 public struct NoThreadsView: View {
 
-    public init () {}
+    public init() {}
 
     public var body: some View {
         NoContentView(
diff --git a/Sources/StreamChatSwiftUI/CommonViews/FloatingBannerViewModifier.swift b/Sources/StreamChatSwiftUI/CommonViews/FloatingBannerViewModifier.swift
@@ -28,7 +28,6 @@ extension View {
     }
 }
 
-
 struct FloatingBannerViewModifier<BannerView: View>: ViewModifier {
     let alignment: Alignment
     var isPresented: Bool
diff --git a/Sources/StreamChatSwiftUI/CommonViews/Shimmer.swift b/Sources/StreamChatSwiftUI/CommonViews/Shimmer.swift
@@ -23,8 +23,8 @@ struct Shimmer: ViewModifier {
             )
             .animation(
                 .linear(duration: duration)
-                .delay(delay)
-                .repeatForever(autoreverses: false), 
+                    .delay(delay)
+                    .repeatForever(autoreverses: false),
                 value: isInitialState
             )
             .onAppear {
@@ -33,7 +33,6 @@ struct Shimmer: ViewModifier {
     }
 }
 
-
 extension View {
     /// Adds an animated shimmering effect to any view, typically to show that
     /// an operation is in progress.
diff --git a/Sources/StreamChatSwiftUI/DefaultViewFactory.swift b/Sources/StreamChatSwiftUI/DefaultViewFactory.swift
@@ -238,6 +238,7 @@ extension ViewFactory {
             )
         }
     }
+
     public func makeMessageListModifier() -> some ViewModifier {
         EmptyViewModifier()
     }
diff --git a/StreamChatSwiftUI-XCFramework.podspec b/StreamChatSwiftUI-XCFramework.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'StreamChatSwiftUI-XCFramework'
-  spec.version = '4.64.0'
+  spec.version = '4.65.0'
   spec.summary = 'StreamChat SwiftUI Chat Components'
   spec.description = 'StreamChatSwiftUI SDK offers flexible SwiftUI components able to display data provided by StreamChat SDK.'
 
@@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
 
   spec.framework = 'Foundation', 'UIKit', 'SwiftUI'
 
-  spec.dependency 'StreamChat-XCFramework', '~> 4.64.0'
+  spec.dependency 'StreamChat-XCFramework', '~> 4.65.0'
 
   spec.cocoapods_version = '>= 1.11.0'
 end
diff --git a/StreamChatSwiftUI.podspec b/StreamChatSwiftUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'StreamChatSwiftUI'
-  spec.version = '4.64.0'
+  spec.version = '4.65.0'
   spec.summary = 'StreamChat SwiftUI Chat Components'
   spec.description = 'StreamChatSwiftUI SDK offers flexible SwiftUI components able to display data provided by StreamChat SDK.'
 
@@ -19,5 +19,5 @@ Pod::Spec.new do |spec|
 
   spec.framework = 'Foundation', 'UIKit', 'SwiftUI'
 
-  spec.dependency 'StreamChat', '~> 4.64.0'
+  spec.dependency 'StreamChat', '~> 4.65.0'
 end
diff --git a/StreamChatSwiftUI.xcodeproj/project.pbxproj b/StreamChatSwiftUI.xcodeproj/project.pbxproj
@@ -3821,7 +3821,7 @@
 			repositoryURL = "https://github.com/GetStream/stream-chat-swift.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.64.0;
+				minimumVersion = 4.65.0;
 			};
 		};
 		E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/ChatThreadListViewModel_Tests.swift b/StreamChatSwiftUITests/Tests/ChatThreadList/ChatThreadListViewModel_Tests.swift
@@ -172,7 +172,7 @@ class ChatThreadListViewModel_Tests: StreamChatTestCase {
         viewModel.eventsController(
             eventController,
             didReceiveEvent: ThreadMessageNewEvent(
-                message: .mock(parentMessageId: .unique), 
+                message: .mock(parentMessageId: .unique),
                 channel: .mock(cid: .unique),
                 unreadCount: .noUnread,
                 createdAt: .unique
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/ChatThreadListView_Tests.swift b/StreamChatSwiftUITests/Tests/ChatThreadList/ChatThreadListView_Tests.swift
@@ -71,7 +71,7 @@ class CustomFactory: ViewFactory {
 
 private class MockChatThreadListViewModel: ChatThreadListViewModel {
     static func empty() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: [],
             isLoading: false,
             isReloading: false,
@@ -86,7 +86,7 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
     }
 
     static func loading() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: [],
             isLoading: true,
             isReloading: false,
@@ -101,7 +101,7 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
     }
 
     static func withThreads() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: mockThreads,
             isLoading: false,
             isReloading: false,
@@ -116,7 +116,7 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
     }
 
     static func loadingMoreThreads() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: mockThreads,
             isLoading: false,
             isReloading: false,
@@ -131,7 +131,7 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
     }
 
     static func reloadingThreads() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: mockThreads,
             isLoading: false,
             isReloading: true,
@@ -146,7 +146,7 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
     }
 
     static func newThreadsAvailable() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: mockThreads,
             isLoading: false,
             isReloading: false,
@@ -161,7 +161,7 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
     }
 
     static func errorLoadingThreads() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: [],
             isLoading: false,
             isReloading: false,
@@ -176,7 +176,7 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
     }
 
     static func errorLoadingMoreThreads() -> MockChatThreadListViewModel {
-        return MockChatThreadListViewModel(
+        MockChatThreadListViewModel(
             threads: mockThreads,
             isLoading: false,
             isReloading: false,
@@ -223,7 +223,6 @@ private class MockChatThreadListViewModel: ChatThreadListViewModel {
         didChangeThreads changes: [ListChange<ChatThread>]
     ) {}
     
-
     static var mockYoda = ChatUser.mock(id: .unique, name: "Yoda")
     static var mockVader = ChatUser.mock(id: .unique, name: "Vader")
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ let package = Package(`
`16`	`16`	`)`
`17`	`17`	`],`
`18`	`18`	`dependencies: [`
`19`		`- .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.64.0"),`
	`19`	`+ .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.65.0"),`
`20`	`20`	`],`
`21`	`21`	`targets: [`
`22`	`22`	`.target(`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public struct ChatThreadListItemViewModel {`
`51`	`51`	`parentMessageText = threadTitle`
`52`	`52`	`} else {`
`53`	`53`	`let formatter = InjectedValues[\.utils].messagePreviewFormatter`
`54`		`- parentMessageText = formatter.formatContent(for: thread.parentMessage)`
	`54`	`+ parentMessageText = formatter.formatContent(for: thread.parentMessage)`
`55`	`55`	`}`
`56`	`56`	`return L10n.Thread.Item.repliedTo(parentMessageText.trimmed)`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public struct ChatThreadListNavigatableItem<ThreadListItem: View, ThreadDestinat`
`24`	`24`	`self.thread = thread`
`25`	`25`	`self.threadListItem = threadListItem`
`26`	`26`	`self.threadDestination = threadDestination`
`27`		`- self._selectedThread = selectedThread`
	`27`	`+ _selectedThread = selectedThread`
`28`	`28`	`self.handleTabBarVisibility = handleTabBarVisibility`
`29`	`29`	`}`
`30`	`30`
`@@ -55,7 +55,7 @@ public struct ThreadSelectionInfo: Identifiable {`
`55`	`55`
`56`	`56`	`public init(thread: ChatThread) {`
`57`	`57`	`self.thread = thread`
`58`		`- self.id = thread.id`
	`58`	`+ id = thread.id`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ extension View {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-`
`32`	`31`	`struct FloatingBannerViewModifier<BannerView: View>: ViewModifier {`
`33`	`32`	`let alignment: Alignment`
`34`	`33`	`var isPresented: Bool`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ struct Shimmer: ViewModifier {`
`23`	`23`	`)`
`24`	`24`	`.animation(`
`25`	`25`	`.linear(duration: duration)`
`26`		`- .delay(delay)`
`27`		`- .repeatForever(autoreverses: false),`
	`26`	`+ .delay(delay)`
	`27`	`+ .repeatForever(autoreverses: false),`
`28`	`28`	`value: isInitialState`
`29`	`29`	`)`
`30`	`30`	`.onAppear {`
`@@ -33,7 +33,6 @@ struct Shimmer: ViewModifier {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-`
`37`	`36`	`extension View {`
`38`	`37`	`/// Adds an animated shimmering effect to any view, typically to show that`
`39`	`38`	`/// an operation is in progress.`
Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,7 @@ extension ViewFactory {`
`238`	`238`	`)`
`239`	`239`	`}`
`240`	`240`	`}`
	`241`	`+`
`241`	`242`	`public func makeMessageListModifier() -> some ViewModifier {`
`242`	`243`	`EmptyViewModifier()`
`243`	`244`	`}`