Merge pull request auth0#8 from auth0/chore-use-submodules

Carthage with submodules
colemancda · Jul 25, 2015 · a81a1bc · a81a1bc
2 parents 7a4a067 + 322e568
commit a81a1bc
Show file tree

Hide file tree

Showing 75 changed files with 395 additions and 2,866 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,4 @@ DerivedData
 
 Pods/
 Carthage/
-!Carthage/Build
+!Carthage/Checkouts
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "Carthage/Checkouts/Quick"]
+	path = Carthage/Checkouts/Quick
+	url = https://github.com/Quick/Quick.git
+[submodule "Carthage/Checkouts/Nimble"]
+	path = Carthage/Checkouts/Nimble
+	url = https://github.com/Quick/Nimble.git
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,11 @@
 reference: http://www.objc.io/issue-6/travis-ci.html
 language: objective-c
-osx_image: beta-xcode6.3
-cache:
-  - bundler
-before_install:
-  - gem install xcpretty --no-ri --no-rdoc
-script:
-  - xcodebuild -project JWTDecode.xcodeproj -scheme JWTDecode-iOS -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" ONLY_ACTIVE_ARCH=NO test | xcpretty -c ; exit ${PIPESTATUS[0]}
+osx_image: xcode6.4
+before_install: true
+install: true
+git:
+  submodules: false
+script: script/cibuild
 branches:
   only:
   - master

diff --git a/Carthage/Build/Mac/Nimble.framework/Headers b/Carthage/Build/Mac/Nimble.framework/Headers
diff --git a/Carthage/Build/Mac/Nimble.framework/Modules b/Carthage/Build/Mac/Nimble.framework/Modules
diff --git a/Carthage/Build/Mac/Nimble.framework/Nimble b/Carthage/Build/Mac/Nimble.framework/Nimble
diff --git a/Carthage/Build/Mac/Nimble.framework/Resources b/Carthage/Build/Mac/Nimble.framework/Resources
diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/DSL.h b/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/DSL.h
diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/NMBExceptionCapture.h b/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/NMBExceptionCapture.h