Merge branch 'travis' into swift

mattrubin · Jan 26, 2015 · 14ab137 · 14ab137
2 parents eb31581 + f5fcc11
commit 14ab137
Show file tree

Hide file tree

Showing 8 changed files with 202 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # Xcode
 #
-build/
+# * build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -31,3 +31,6 @@ DerivedData
 # Carthage/Checkouts
 
 Carthage/Build
+
+#  *Travis cannot `carthage bootstrap` because of code signing issues, so for now include the iOS builds
+!Carthage/Build/iOS
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+language: objective-c
+
+xcode_workspace: onetimepassword.xcworkspace
+xcode_scheme: OneTimePassword
+
+xcode_sdk:
+- iphonesimulator8.1
+
+script: xcodebuild -workspace onetimepassword.xcworkspace -scheme OneTimePassword -sdk iphonesimulator8.1 build test
diff --git a/Carthage/Build/iOS/Base32.framework/Base32 b/Carthage/Build/iOS/Base32.framework/Base32
diff --git a/Carthage/Build/iOS/Base32.framework/Headers/Base32.h b/Carthage/Build/iOS/Base32.framework/Headers/Base32.h
diff --git a/Carthage/Build/iOS/Base32.framework/Headers/MF_Base32Additions.h b/Carthage/Build/iOS/Base32.framework/Headers/MF_Base32Additions.h
diff --git a/Carthage/Build/iOS/Base32.framework/Info.plist b/Carthage/Build/iOS/Base32.framework/Info.plist
diff --git a/Carthage/Build/iOS/Base32.framework/Modules/module.modulemap b/Carthage/Build/iOS/Base32.framework/Modules/module.modulemap
diff --git a/Carthage/Build/iOS/Base32.framework/_CodeSignature/CodeResources b/Carthage/Build/iOS/Base32.framework/_CodeSignature/CodeResources