Merge pull request hyperoslo#147 from hyperoslo/fix/carthage

Update Carthage
GoMotive · Nov 2, 2017 · 83416d6 · 83416d6
2 parents 026153f + 4f9540b
commit 83416d6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,3 @@
-github "hyperoslo/Cache" "4.0.2"
+github "hyperoslo/Cache" "4.1.2"
 github "hyperoslo/Hue" "3.0.0"
-github "hyperoslo/Imaginary" "3.0.0"
-github "onmyway133/SwiftHash" "2.0.1"
+github "hyperoslo/Imaginary" "3.0.2"
diff --git a/Lightbox.xcodeproj/project.pbxproj b/Lightbox.xcodeproj/project.pbxproj
@@ -235,7 +235,6 @@
 				"$(SRCROOT)/Carthage/Build/iOS/Hue.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/Imaginary.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/Cache.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/SwiftHash.framework",
 			);
 			name = "Copy frameworks with Carthage";
 			outputPaths = (

diff --git a/bin/bootstrap b/bin/bootstrap
diff --git a/bin/bootstrap-if-needed b/bin/bootstrap-if-needed
diff --git a/circle.yml b/circle.yml
@@ -4,9 +4,8 @@ machine:
 
 dependencies:
   override:
-    - bin/bootstrap-if-needed
-  cache_directories:
-    - "Carthage"
+    - rm -rf Carthage
+    - carthage update
 
 test:
   override: