Merge pull request #71 from hyperoslo/fix/carthage

Specify Cache version in Cartfile
hyperoslo · Nov 2, 2017 · 8f99f0b · 8f99f0b
2 parents 3c41657 + 4301fca
commit 8f99f0b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 17 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "hyperoslo/Cache"
+github "hyperoslo/Cache" ~> 4.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1 @@
-github "hyperoslo/Cache" "4.0.0"
-github "onmyway133/SwiftHash" "2.0.1"
+github "hyperoslo/Cache" "4.1.2"
diff --git a/Imaginary.xcodeproj/project.pbxproj b/Imaginary.xcodeproj/project.pbxproj
@@ -603,7 +603,6 @@
 			);
 			inputPaths = (
 				"$(SRCROOT)/Carthage/Build/tvOS/Cache.framework",
-				"$(SRCROOT)/Carthage/Build/tvOS/SwiftHash.framework",
 			);
 			outputPaths = (
 			);
@@ -618,7 +617,6 @@
 			);
 			inputPaths = (
 				"$(SRCROOT)/Carthage/Build/iOS/Cache.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/SwiftHash.framework",
 			);
 			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:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "hyperoslo/Cache"
		github "hyperoslo/Cache" ~> 4.0