From c82a63cec56ef2268c34bb75e833ffa59ffde5b6 Mon Sep 17 00:00:00 2001
From: OhKanghoon <ggaa96@naver.com>
Date: Sat, 28 Aug 2021 23:39:15 +0900
Subject: [PATCH] upgrade carthage version

---
 .circleci/config.yml | 3 +++
 Cartfile.resolved    | 6 +++---
 Rakefile             | 2 +-
 scripts/bootstrap.sh | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index df6ceb6f4..c00d5aeac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,6 +57,9 @@ jobs:
           environment:
             BUNDLE_JOBS: 4
             BUNDLE_RETRY: 3
+      - run:
+          name: Upgrade Carthage
+          command: brew upgrade carthage
       - run: 
           name: Bootstrap Carthage
           command: scripts/bootstrap-if-needed.sh
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 15fe5ea11..50893b65b 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,6 +1,6 @@
 github "Alamofire/Alamofire" "5.4.3"
-github "AliSoftware/OHHTTPStubs" "9.1.0"
-github "Quick/Nimble" "v9.2.0"
-github "Quick/Quick" "v4.0.0"
 github "ReactiveCocoa/ReactiveSwift" "6.6.1"
 github "ReactiveX/RxSwift" "6.2.0"
+github "AliSoftware/OHHTTPStubs" "9.1.0"
+github "Quick/Nimble" "v9.2.0"
+github "Quick/Quick" "v4.0.0"
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index e82352f7a..9311304ef 100644
--- a/Rakefile
+++ b/Rakefile
@@ -143,7 +143,7 @@ namespace :test do
     Dir.mkdir("carthage_test")
     File.write(File.join("carthage_test", "Cartfile"), "git \"file://#{Dir.pwd}\" \"HEAD\"")
     Dir.chdir "carthage_test" do
-      sh "./scripts/carthage bootstrap --platform 'iOS'"
+      sh "../scripts/carthage.sh bootstrap --platform 'iOS'"
       has_artifacts = Dir.glob("Carthage/Build/*").count > 0
       raise("Carthage did not succeed") unless has_artifacts
     end
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index d08c0b57e..2cd430b76 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-carthage bootstrap
+scripts/carthage.sh bootstrap
 cp Cartfile.resolved Carthage