Merged #90 into master

.travis.yml

@@ -4,7 +4,8 @@ before_install:
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
 
 env:
-  - RAKETASK="ios[iOS StaticLib,7.1,test]"
+  #- RAKETASK="simlist"
+  #- RAKETASK="ios[iOS StaticLib,7.1,test]"
   - RAKETASK="ios[iOS StaticLib,latest,test]"
   - RAKETASK="ios[iOS Framework,latest,analyze]"
   - RAKETASK="osx[Mac Framework,x86_64,test]"

CHANGELOG.md

@@ -1,5 +1,12 @@
 _You can download previous versions [here](https://github.com/AliSoftware/OHHTTPStubs/tags) and latest version [here](https://github.com/AliSoftware/OHHTTPStubs/zipball/master) (ZIP files generated by GitHub on the fly)_
 
+## [3.1.11](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.11)
+
+* Added [Carthage](https://github.com/Carthage/Carthage) support
+* Splitted the Xcode projects for more clarity (one dedicated to build the lib and run Unit Tests, and one for the Demo)
+* Got rid of the `git submodule` used for Unit Tests against [AFNetworking](https://github.com/AFNetworking/AFNetworking) — it is now imported using [CocoaPods](http://cocoapods.org) and only for the lib's Unit Tests targets ([@corinnekrych](https://github.com/corinnekrych), [#90](https://github.com/AliSoftware/OHHTTPStubs/pull/90))
+* Improved [Travis-CI](https://travis-ci.org/AliSoftware/OHHTTPStubs) integration. We now use a build matrix to have paralellized and independant builds for each scheme (iOS Static Lib, iOS Dynamic Framework, OSX Framework)
+
 ## [3.1.10](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.10)
 
 * Fix headers for people still building with Xcode 5 & SDK 7 (#80)

OHHTTPStubsDemo/OHHTTPStubsDemo.xcodeproj/project.pbxproj → Example/OHHTTPStubsDemo.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		097935A2161B654E006DB5D5 /* libOHHTTPStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 097935A1161B654E006DB5D5 /* libOHHTTPStubs.a */; };
 		0984831517805426002A99FF /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0984831417805426002A99FF /* CFNetwork.framework */; };
 		098FBDD415D704E800623941 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 098FBDD315D704E800623941 /* UIKit.framework */; };
 		098FBDD615D704E800623941 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 098FBDD515D704E800623941 /* Foundation.framework */; };
@@ -18,10 +17,10 @@
 		098FBDF815D70E2600623941 /* stub.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF615D70E2600623941 /* stub.jpg */; };
 		098FBDF915D70E2600623941 /* stub.txt in Resources */ = {isa = PBXBuildFile; fileRef = 098FBDF715D70E2600623941 /* stub.txt */; };
 		099C7343169016D800239880 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 099C7342169016D800239880 /* [email protected] */; };
+		76C30541E2A1B24B6848F032 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B8BA1C0EA8F8EC24B9024E1 /* libPods.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		097935A1161B654E006DB5D5 /* libOHHTTPStubs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOHHTTPStubs.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		0984831417805426002A99FF /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		098FBDCF15D704E800623941 /* OHHTTPStubsDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OHHTTPStubsDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		098FBDD315D704E800623941 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -36,18 +35,22 @@
 		098FBDF615D70E2600623941 /* stub.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = stub.jpg; sourceTree = "<group>"; };
 		098FBDF715D70E2600623941 /* stub.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stub.txt; sourceTree = "<group>"; };
 		099C7342169016D800239880 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		0EE81E095FF3A8AF6D3C4E77 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
+		1B8BA1C0EA8F8EC24B9024E1 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		48556A011AA6E9FD0074B154 /* libPods-OHHTTPStubs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-OHHTTPStubs.a"; path = "Pods/../build/Debug-iphoneos/libPods-OHHTTPStubs.a"; sourceTree = "<group>"; };
+		B5AD292FAB98FC9C7637896A /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		098FBDCC15D704E800623941 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				097935A2161B654E006DB5D5 /* libOHHTTPStubs.a in Frameworks */,
 				0984831517805426002A99FF /* CFNetwork.framework in Frameworks */,
 				098FBDD415D704E800623941 /* UIKit.framework in Frameworks */,
 				098FBDD615D704E800623941 /* Foundation.framework in Frameworks */,
 				098FBDD815D704E800623941 /* CoreGraphics.framework in Frameworks */,
+				76C30541E2A1B24B6848F032 /* libPods.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -57,10 +60,10 @@
 		098FBDC415D704E800623941 = {
 			isa = PBXGroup;
 			children = (
-				099C7342169016D800239880 /* [email protected] */,
 				098FBDD915D704E800623941 /* OHHTTPStubsDemo */,
 				098FBDD215D704E800623941 /* Frameworks */,
 				098FBDD015D704E800623941 /* Products */,
+				DBC538A23E8B9FD8D58D30B1 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -75,10 +78,12 @@
 		098FBDD215D704E800623941 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				48556A011AA6E9FD0074B154 /* libPods-OHHTTPStubs.a */,
 				0984831417805426002A99FF /* CFNetwork.framework */,
 				098FBDD315D704E800623941 /* UIKit.framework */,
 				098FBDD515D704E800623941 /* Foundation.framework */,
 				098FBDD715D704E800623941 /* CoreGraphics.framework */,
+				1B8BA1C0EA8F8EC24B9024E1 /* libPods.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -102,17 +107,27 @@
 				098FBDDF15D704E800623941 /* main.m */,
 				098FBDE115D704E800623941 /* OHHTTPStubsDemo-Prefix.pch */,
 			);
-			name = "Supporting Files";
+			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		098FBDFA15D70E2F00623941 /* Stubs */ = {
 			isa = PBXGroup;
 			children = (
-				097935A1161B654E006DB5D5 /* libOHHTTPStubs.a */,
+				099C7342169016D800239880 /* [email protected] */,
 				098FBDF615D70E2600623941 /* stub.jpg */,
 				098FBDF715D70E2600623941 /* stub.txt */,
 			);
 			name = Stubs;
+			path = Resources;
+			sourceTree = "<group>";
+		};
+		DBC538A23E8B9FD8D58D30B1 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				B5AD292FAB98FC9C7637896A /* Pods.debug.xcconfig */,
+				0EE81E095FF3A8AF6D3C4E77 /* Pods.release.xcconfig */,
+			);
+			name = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -122,9 +137,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 098FBDE715D704E800623941 /* Build configuration list for PBXNativeTarget "OHHTTPStubsDemo" */;
 			buildPhases = (
+				5BF07CD1F1DEB3893534CA6D /* Check Pods Manifest.lock */,
 				098FBDCB15D704E800623941 /* Sources */,
 				098FBDCC15D704E800623941 /* Frameworks */,
 				098FBDCD15D704E800623941 /* Resources */,
+				D61C918AA467A72C9C508B4E /* Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -175,6 +192,39 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		5BF07CD1F1DEB3893534CA6D /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		D61C918AA467A72C9C508B4E /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		098FBDCB15D704E800623941 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -278,25 +328,27 @@
 		};
 		098FBDE815D704E800623941 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = B5AD292FAB98FC9C7637896A /* Pods.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "OHHTTPStubsDemo-Prefix.pch";
-				INFOPLIST_FILE = "OHHTTPStubsDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
 		};
 		098FBDE915D704E800623941 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 0EE81E095FF3A8AF6D3C4E77 /* Pods.release.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "OHHTTPStubsDemo-Prefix.pch";
-				INFOPLIST_FILE = "OHHTTPStubsDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

Example/Podfile

@@ -0,0 +1,6 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
+xcodeproj 'OHHTTPStubsDemo.xcodeproj'
+platform :ios, '6.0'
+
+pod 'OHHTTPStubs', :path => '../'

Example/Podfile.lock

@@ -0,0 +1,16 @@
+PODS:
+  - OHHTTPStubs (3.1.11):
+    - OHHTTPStubs/Core (= 3.1.11)
+  - OHHTTPStubs/Core (3.1.11)
+
+DEPENDENCIES:
+  - OHHTTPStubs (from `../`)
+
+EXTERNAL SOURCES:
+  OHHTTPStubs:
+    :path: ../
+
+SPEC CHECKSUMS:
+  OHHTTPStubs: 5624a5d20d97d46d47e15a68ca8808b59ccf0512
+
+COCOAPODS: 0.36.0