Merge pull request #63 from zenangst/fix/carthage-build

Fix Carthage build
zenangst · May 11, 2017 · 0bd529e · 0bd529e
2 parents 2f8988a + 20f254e
commit 0bd529e
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 346 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,4 +34,3 @@ Carthage
 
 # SPM
 .build/
-Podfile.lock
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,19 @@
-osx_image: xcode8
+osx_image: xcode8.2
 language: objective-c
 
+cache:
+  directories:
+    - Carthage
+
 before_install:
-- gem install xcpretty
-- brew update
-- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
-- travis_wait 25 pod repo update --silent
-- pod install
+  - travis_wait 35; bin/bootstrap-if-needed
 
 script:
-- xcodebuild clean build -workspace Tailor.xcworkspace -scheme Tailor-iOS -sdk iphonesimulator | xcpretty
-- xcodebuild test -workspace Tailor.xcworkspace -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty
-- xcodebuild clean build -workspace Tailor.xcworkspace -scheme Tailor-Mac -sdk macosx | xcpretty
-- xcodebuild test -workspace Tailor.xcworkspace -scheme Tailor-Mac -sdk macosx | xcpretty
+  - xcodebuild clean
+  - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator | xcpretty
+  - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.2' | xcpretty
+  - xcodebuild clean build -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty
+  - xcodebuild test -project Tailor.xcodeproj -scheme Tailor-Mac -sdk macosx | xcpretty
 
 notifications:
   email: false
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1,2 @@
+github "Quick/Nimble"
+github "Quick/Quick"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "Quick/Nimble" "v7.0.0"
+github "Quick/Quick" "v1.1.0"
diff --git a/Podfile b/Podfile
diff --git a/Tailor.xcodeproj/project.pbxproj b/Tailor.xcodeproj/project.pbxproj
diff --git a/Tailor.xcworkspace/contents.xcworkspacedata b/Tailor.xcworkspace/contents.xcworkspacedata
diff --git a/bin/bootstrap b/bin/bootstrap
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+carthage bootstrap
+cp Cartfile.resolved Carthage
diff --git a/bin/bootstrap-if-needed b/bin/bootstrap-if-needed
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if ! cmp -s Cartfile.resolved Carthage/Cartfile.resolved; then
+  bin/bootstrap
+fi
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github "Quick/Nimble" "v7.0.0"
		github "Quick/Quick" "v1.1.0"