Merge pull request #196 from sendbird/luke/xcode-14

Update for Xcode 14.1+
sendbird · Apr 21, 2023 · e537540 · e537540
2 parents f58e10e + 9ff973d
commit e537540
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@
 .AppleDouble
 .LSOverride
 
+# AppCode
+.idea
+
 # Icon must end with two
 Icon
 

diff --git a/Apps/DeleteMessageOpenChannel/Sources/UseCase/DeleteMessageUseCase.swift b/Apps/DeleteMessageOpenChannel/Sources/UseCase/DeleteMessageUseCase.swift
@@ -19,7 +19,7 @@ final class DeleteMessageUseCase {
     }
 
     private func subscribeToDeleteMessageDelegate() {
-        SendbirdChat.add(self, identifier: "[DELETE_MESSAGE_DELEGATE]")
+        SendbirdChat.addChannelDelegate(self, identifier: "[DELETE_MESSAGE_DELEGATE]")
     }
 
     func deleteMessage(_ message: BaseMessage, completion: @escaping (Result<Void, SBError>) -> Void) {

diff --git a/Apps/MarkAsReadGroupChannel/Sources/UseCase/MarkAsReadUseCase.swift b/Apps/MarkAsReadGroupChannel/Sources/UseCase/MarkAsReadUseCase.swift
@@ -32,7 +32,7 @@ class MarkAsReadUseCase: GroupChannelDelegate {
     }
 
     private func subscribeToGroupChannelDelegate() {
-        SendbirdChat.add(self, identifier: String(describing: self))
+        SendbirdChat.addChannelDelegate(self, identifier: String(describing: self))
     }
 
     func markAsRead() {

diff --git a/Apps/MentionUsersInMessageGroupChannel/Sources/Channel/MentionedUserMessageCell.swift b/Apps/MentionUsersInMessageGroupChannel/Sources/Channel/MentionedUserMessageCell.swift
@@ -40,7 +40,7 @@ class MentionedUserMessageCell: BasicMessageCell {
     ) {
         configure(with: message)
         let userNames: [String] = message.mentionedUsers.map {
-            $0.nickname ?? $0.userId
+            $0.nickname
         }
         usersLabel.text = userNames.joined(separator: ",")
     }

diff --git a/Apps/MentionUsersInMessageOpenChannel/Sources/Channel/MentionedUserMessageCell.swift b/Apps/MentionUsersInMessageOpenChannel/Sources/Channel/MentionedUserMessageCell.swift
@@ -40,7 +40,7 @@ class MentionedUserMessageCell: BasicMessageCell {
     ) {
         configure(with: message)
         let userNames: [String] = message.mentionedUsers.map {
-            $0.nickname ?? $0.userId
+            $0.nickname
         }
         usersLabel.text = userNames.joined(separator: ",")
     }

diff --git a/Apps/PollsGroupChannel/Sources/Poll/TimePicker.swift b/Apps/PollsGroupChannel/Sources/Poll/TimePicker.swift
@@ -22,7 +22,7 @@ extension UIAlertController{
         addAction(UIAlertAction(title: "Done", style: .cancel, handler: { action in
             onDateSelected(datePicker.date)
         }))
-        let height: NSLayoutConstraint = NSLayoutConstraint(item: view, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.1, constant: 300)
+        let height: NSLayoutConstraint = NSLayoutConstraint(item: view!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.1, constant: 300)
         view.addConstraint(height)
 
         datePicker.translatesAutoresizingMaskIntoConstraints = false

diff --git a/Apps/PushNotificationsGroupChannel/Sources/UseCase/PushNotificationUseCase.swift b/Apps/PushNotificationsGroupChannel/Sources/UseCase/PushNotificationUseCase.swift
@@ -42,7 +42,7 @@ class PushNotificationUseCase {
             })
         }
         else {
-            SendbirdChat.unregisterPushToken(pushToken, completionHandler: { (response, error) in
+            SendbirdChat.unregisterPushToken(pushToken, completionHandler: { error in
                 guard error == nil else {
                     // Handle error.
                     return
@@ -52,13 +52,12 @@ class PushNotificationUseCase {
     }
 
     func unRegisterAllDevices() {
-        SendbirdChat.unregisterAllPushToken(completionHandler: { (response, error) in
+        SendbirdChat.unregisterAllPushToken(completionHandler: { error in
             guard error == nil else {
                 // Handle error.
                 return
             }
         })
-
     }
 
 }
diff --git a/Apps/PushNotificationsTranslationGroupChannel/Sources/UseCase/PushNotificationUseCase.swift b/Apps/PushNotificationsTranslationGroupChannel/Sources/UseCase/PushNotificationUseCase.swift
@@ -42,7 +42,7 @@ class PushNotificationUseCase {
             })
         }
         else {
-            SendbirdChat.unregisterPushToken(pushToken, completionHandler: { (response, error) in
+            SendbirdChat.unregisterPushToken(pushToken, completionHandler: { error in
                 guard error == nil else {
                     // Handle error.
                     return
@@ -52,7 +52,7 @@ class PushNotificationUseCase {
     }
 
     func unRegisterAllDevices() {
-        SendbirdChat.unregisterAllPushToken(completionHandler: { (response, error) in
+        SendbirdChat.unregisterAllPushToken(completionHandler: { error in
             guard error == nil else {
                 // Handle error.
                 return

diff --git a/Apps/ScheduledMessagesGroupChannel/Sources/Channel/UIDateTimePickerAlertController.swift b/Apps/ScheduledMessagesGroupChannel/Sources/Channel/UIDateTimePickerAlertController.swift
@@ -23,7 +23,7 @@ extension UIAlertController{
         addAction(UIAlertAction(title: "Done", style: .cancel, handler: { action in
             onDateSelected(datePicker.date)
         }))
-        let height: NSLayoutConstraint = NSLayoutConstraint(item: view, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.1, constant: 300)
+        let height: NSLayoutConstraint = NSLayoutConstraint(item: view!, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.1, constant: 300)
         view.addConstraint(height)
 
         datePicker.translatesAutoresizingMaskIntoConstraints = false

diff --git a/Apps/TypingIndicatorGroupChannel/Sources/UseCase/GroupChannelTypingIndicatorUseCase.swift b/Apps/TypingIndicatorGroupChannel/Sources/UseCase/GroupChannelTypingIndicatorUseCase.swift
@@ -28,7 +28,7 @@ final class GroupChannelTypingIndicatorUseCase: GroupChannelDelegate {
     }
 
     private func subscribeToTypingIndicatorDelegate() {
-        SendbirdChat.add(self, identifier: "[TYPING_INDICATOR_DELEGATE]")
+        SendbirdChat.addChannelDelegate(self, identifier: "[TYPING_INDICATOR_DELEGATE]")
     }
 
     func startTyping() {
@@ -72,6 +72,6 @@ final class GroupChannelTypingIndicatorUseCase: GroupChannelDelegate {
     }
 
     private func getUsername(user: User) -> String {
-        return user.nickname ?? user.userId
+        return user.nickname
     }
 }
diff --git a/Apps/UserDoNotDisturbSnooze/Sources/UseCase/PushNotificationUseCase.swift b/Apps/UserDoNotDisturbSnooze/Sources/UseCase/PushNotificationUseCase.swift
@@ -42,7 +42,7 @@ class PushNotificationUseCase {
             })
         }
         else {
-            SendbirdChat.unregisterPushToken(pushToken, completionHandler: { (response, error) in
+            SendbirdChat.unregisterPushToken(pushToken, completionHandler: { error in
                 guard error == nil else {
                     // Handle error.
                     return
@@ -52,7 +52,7 @@ class PushNotificationUseCase {
     }
 
     func unRegisterAllDevices() {
-        SendbirdChat.unregisterAllPushToken(completionHandler: { (response, error) in
+        SendbirdChat.unregisterAllPushToken(completionHandler: { error in
             guard error == nil else {
                 // Handle error.
                 return

diff --git a/Apps/iOSTrueGroupChannel/Sources/UseCase/iOSTrueUseCase.swift b/Apps/iOSTrueGroupChannel/Sources/UseCase/iOSTrueUseCase.swift
@@ -26,7 +26,7 @@ class iOSTrueUseCase: NSObject {
     init(channel: GroupChannel?) {
         self.channel = channel
         super.init()
-        SendbirdChat.add(self as ConnectionDelegate, identifier: "[CONNECTION_DELEGATE]")
+        SendbirdChat.addConnectionDelegate(self as ConnectionDelegate, identifier: "[CONNECTION_DELEGATE]")
     }
 
     func checkUserConnectionStatus() {

diff --git a/Modules/CommonModule/Sources/UseCase/GroupChannel/GroupChannelUserSelectionUseCase.swift b/Modules/CommonModule/Sources/UseCase/GroupChannel/GroupChannelUserSelectionUseCase.swift
@@ -35,11 +35,13 @@ open class GroupChannelUserSelectionUseCase {
     open func reloadUsers() {
         userListQuery = createApplicationUserListQuery()
 
-        guard let userListQuery = userListQuery, userListQuery.hasNext else { return }
-
+        guard let userListQuery = userListQuery,
+              userListQuery.hasNext,
+              userListQuery.isLoading == false else { return }
+
         userListQuery.loadNextPage { [weak self] users, error in
             guard let self = self else { return }
-            
+
             if let error = error {
                 self.delegate?.userSelectionUseCase(self, didReceiveError: error)
                 return
@@ -53,11 +55,13 @@ open class GroupChannelUserSelectionUseCase {
     }
 
     open func loadNextPage() {
-        guard let userListQuery = userListQuery, userListQuery.hasNext else { return }
-
+        guard let userListQuery = userListQuery,
+              userListQuery.hasNext,
+              userListQuery.isLoading == false else { return }
+
         userListQuery.loadNextPage { [weak self] users, error in
             guard let self = self else { return }
-            
+
             if let error = error {
                 self.delegate?.userSelectionUseCase(self, didReceiveError: error)
                 return

diff --git a/Modules/CommonModule/Sources/Util/UIColor+Extension.swift b/Modules/CommonModule/Sources/Util/UIColor+Extension.swift
@@ -14,10 +14,10 @@ public extension UIColor {
             let hexString: String = hexString.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
             let scanner = Scanner(string: hexString)
             if (hexString.hasPrefix("#")) {
-                scanner.scanLocation = 1
+                scanner.currentIndex = hexString.index(after: hexString.startIndex)
             }
-            var color: UInt32 = 0
-            scanner.scanHexInt32(&color)
+            var color: UInt64 = 0
+            scanner.scanHexInt64(&color)
             let mask = 0x000000FF
             let r = Int(color >> 16) & mask
             let g = Int(color >> 8) & mask

diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift
@@ -9,7 +9,7 @@ import ProjectDescription
 
 let dependencies = Dependencies(
     swiftPackageManager: [
-        .remote(url: "https://github.com/sendbird/sendbird-chat-sdk-ios", requirement: .upToNextMinor(from: "4.2.1")),
+        .remote(url: "https://github.com/sendbird/sendbird-chat-sdk-ios", requirement: .upToNextMinor(from: "4.6.3")),
         .remote(url: "https://github.com/onevcat/Kingfisher", requirement: .upToNextMinor(from: "7.2.0")),
     ],
     platforms: [.iOS]