Updated StreamChat dependency (#565)

* Updated StreamChat dependency * Update release script
GetStream · Jul 31, 2024 · 84d59be · 84d59be
1 parent e4a405e
commit 84d59be
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
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.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
@@ -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
@@ -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
@@ -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
@@ -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')