From 84d59be4115a5a7b40a20edfa216be6cd341b167 Mon Sep 17 00:00:00 2001
From: Toomas Vahter <toomas.vahter@gmail.com>
Date: Wed, 31 Jul 2024 17:14:12 +0300
Subject: [PATCH] Updated StreamChat dependency (#565)

* Updated StreamChat dependency

* Update release script
---
 Package.swift                               | 2 +-
 StreamChatSwiftUI-XCFramework.podspec       | 2 +-
 StreamChatSwiftUI.podspec                   | 2 +-
 StreamChatSwiftUI.xcodeproj/project.pbxproj | 2 +-
 fastlane/Fastfile                           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Package.swift b/Package.swift
index a8f31100..8aafe6c2 100644
--- 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.60.0"),
+        .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.61.0"),
     ],
     targets: [
         .target(
diff --git a/StreamChatSwiftUI-XCFramework.podspec b/StreamChatSwiftUI-XCFramework.podspec
index 7f147a04..bd38ad24 100644
--- a/StreamChatSwiftUI-XCFramework.podspec
+++ b/StreamChatSwiftUI-XCFramework.podspec
@@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
 
   spec.framework = 'Foundation', 'UIKit', 'SwiftUI'
 
-  spec.dependency 'StreamChat-XCFramework', '~> 4.60.0'
+  spec.dependency 'StreamChat-XCFramework', '~> 4.61.0'
 
   spec.cocoapods_version = '>= 1.11.0'
 end
diff --git a/StreamChatSwiftUI.podspec b/StreamChatSwiftUI.podspec
index 5b55673e..f5df2f8e 100644
--- a/StreamChatSwiftUI.podspec
+++ b/StreamChatSwiftUI.podspec
@@ -19,5 +19,5 @@ Pod::Spec.new do |spec|
 
   spec.framework = 'Foundation', 'UIKit', 'SwiftUI'
 
-  spec.dependency 'StreamChat', '~> 4.60.0'
+  spec.dependency 'StreamChat', '~> 4.61.0'
 end
diff --git a/StreamChatSwiftUI.xcodeproj/project.pbxproj b/StreamChatSwiftUI.xcodeproj/project.pbxproj
index eb47e273..6eddd91d 100644
--- a/StreamChatSwiftUI.xcodeproj/project.pbxproj
+++ b/StreamChatSwiftUI.xcodeproj/project.pbxproj
@@ -3709,7 +3709,7 @@
 			repositoryURL = "https://github.com/GetStream/stream-chat-swift.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.60.0;
+				minimumVersion = 4.61.0;
 			};
 		};
 		E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8ae5470f..ee9d97de 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -149,8 +149,8 @@ lane :merge_main_to_develop do
 
   sh('git checkout main')
   sh('git pull origin main')
-  sh('git checkout develop')
-  sh('git pull origin develop')
+  sh('git checkout origin/develop')
+  sh('git pull')
   sh('git log develop..main')
   sh('git merge main')
   sh('git push')