Build with iOS 6.1 simulator.

appsquickly · Sep 8, 2013 · e236cd8 · e236cd8
1 parent e1bb3b9
commit e236cd8
Show file tree

Hide file tree

Showing 14 changed files with 3,375 additions and 12,312 deletions.
diff --git a/Tests/Pods/Pods.xcodeproj/project.pbxproj b/Tests/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-OCHamcrest.xcscheme b/...Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-OCHamcrest.xcscheme
diff --git a/.../Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-OCMockito.xcscheme b/.../Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-OCMockito.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-Typhoon.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-Typhoon.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods).xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods).xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios-OCHamcrest.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios-OCHamcrest.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios-OCMockito.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios-OCMockito.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-OCHamcrest.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-OCHamcrest.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-OCMockito.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-OCMockito.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-Typhoon.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-Typhoon.xcscheme
diff --git a/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx.xcscheme b/Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx.xcscheme
diff --git a/Tests/Tests.xcodeproj/project.pbxproj b/Tests/Tests.xcodeproj/project.pbxproj
@@ -762,7 +762,7 @@
 				LastUpgradeCheck = 0460;
 				TargetAttributes = {
 					4B9685A117D26E8200E69723 = {
-						TestTargetID = 4B84146B179B0E3900916BF5;
+						TestTargetID = 4B84146B179B0E3900916BF5 /* iOS Tests (Cocoapods) */;
 					};
 				};
 			};

diff --git a/build-configuration.properties b/build-configuration.properties
@@ -1,7 +1,9 @@
 #----------------------------------------------- Release Configuration ------------------------------------------------#
 module.name=Typhoon
 module.company=Jasper_Blues
-module.sdk.version=7.0
+
+#This has to be 6.1 for now, because 7.0 fails to start properly on the Bamboo server
+module.sdk.version=6.1
 module.osx.sdk.version=10.8
 library.ios.name=Typhoon-iOS
 library.osx.name=Typhoon-OSX