Merge pull request #131 from AliSoftware/fix/umbrella-header

Fix #127 - Umbrella Headers
AliSoftware · Oct 24, 2015 · fda51d0 · fda51d0
2 parents f6904f1 + 9e3f69c
commit fda51d0
Show file tree

Hide file tree

Showing 26 changed files with 150 additions and 63 deletions.
diff --git a/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
@@ -16,6 +16,9 @@
 		09110A751980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A711980606A00D175E4 /* OHHTTPStubsResponse+HTTPMessage.m */; };
 		09110A761980606A00D175E4 /* OHHTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */; };
 		09110A791980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */; };
+		09199FCF1BD974F10014376D /* OHHTTPStubsUmbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 09199FCC1BD973800014376D /* OHHTTPStubsUmbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		09199FD01BD974F20014376D /* OHHTTPStubsUmbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 09199FCC1BD973800014376D /* OHHTTPStubsUmbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		09199FD11BD98D1C0014376D /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0955699A1B90E4EA00503ADC /* OHHTTPStubsSwift.swift */; };
 		093442E21B80EC4A00A91535 /* TimingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814D1980668E00807DBE /* TimingTests.m */; };
 		093442E31B80EC4A00A91535 /* OHPathHelpersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 221C34A41B0CCF0600FCA8FF /* OHPathHelpersTests.m */; };
 		093442E41B80EC4A00A91535 /* NSURLConnectionDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814A1980668E00807DBE /* NSURLConnectionDelegateTests.m */; };
@@ -42,8 +45,7 @@
 		094906DD1B7F60D100B047DA /* OHPathHelpers.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 095B1AD31AE30BA7009D1B56 /* OHPathHelpers.h */; };
 		094906DE1B7F60E200B047DA /* OHHTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D6DB84E1B763B7A00FCF855 /* OHHTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		094906DF1B7F60EE00B047DA /* OHHTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D6DB84E1B763B7A00FCF855 /* OHHTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		095925D41BAEBEAA00DD7F0B /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0955699A1B90E4EA00503ADC /* OHHTTPStubsSwift.swift */; settings = {ASSET_TAGS = (); }; };
-		095925D61BAEC00200DD7F0B /* SwiftHelpersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095925D51BAEC00200DD7F0B /* SwiftHelpersTests.swift */; settings = {ASSET_TAGS = (); }; };
+		095925D61BAEC00200DD7F0B /* SwiftHelpersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095925D51BAEC00200DD7F0B /* SwiftHelpersTests.swift */; };
 		095981881980682800807DBE /* AFNetworkingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 095981481980668E00807DBE /* AFNetworkingTests.m */; };
 		095981891980682E00807DBE /* NilValuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 095981491980668E00807DBE /* NilValuesTests.m */; };
 		0959818A1980682E00807DBE /* NSURLConnectionDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0959814A1980668E00807DBE /* NSURLConnectionDelegateTests.m */; };
@@ -161,6 +163,8 @@
 		09110A721980606A00D175E4 /* OHHTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OHHTTPStubsResponse+JSON.h"; sourceTree = "<group>"; };
 		09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+JSON.m"; sourceTree = "<group>"; };
 		09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = "<group>"; };
+		09199FCC1BD973800014376D /* OHHTTPStubsUmbrella.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubsUmbrella.h; sourceTree = "<group>"; };
+		09199FCE1BD974E80014376D /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		093442DC1B80EC3B00A91535 /* OHHTTPStubs iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OHHTTPStubs iOS-Info.plist"; sourceTree = "<group>"; };
 		093442F91B80EC4A00A91535 /* OHHTTPStubs iOS Fmk Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OHHTTPStubs iOS Fmk Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		0955699A1B90E4EA00503ADC /* OHHTTPStubsSwift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OHHTTPStubsSwift.swift; sourceTree = "<group>"; };
@@ -305,11 +309,10 @@
 			isa = PBXGroup;
 			children = (
 				09D0D2981B67FED3004E7213 /* Compatibility.h */,
-				09110A6A1980605A00D175E4 /* OHHTTPStubs.h */,
-				09110A6B1980605A00D175E4 /* OHHTTPStubs.m */,
-				1D6DB84D1B763B7A00FCF855 /* Mocktail */,
+				09199FCD1BD9744C0014376D /* OHHTTPStubs */,
 				09110A6D1980605D00D175E4 /* OHHTTPStubsResponse */,
 				09110A771980607200D175E4 /* NSURLSession Support */,
+				1D6DB84D1B763B7A00FCF855 /* Mocktail */,
 				093443011B80F88700A91535 /* OHPathHelpers */,
 				095569991B90E4EA00503ADC /* Swift */,
 			);
@@ -356,6 +359,15 @@
 			path = NSURLSession;
 			sourceTree = "<group>";
 		};
+		09199FCD1BD9744C0014376D /* OHHTTPStubs */ = {
+			isa = PBXGroup;
+			children = (
+				09110A6A1980605A00D175E4 /* OHHTTPStubs.h */,
+				09110A6B1980605A00D175E4 /* OHHTTPStubs.m */,
+			);
+			name = OHHTTPStubs;
+			sourceTree = "<group>";
+		};
 		093442FE1B80F84800A91535 /* HTTPMessage */ = {
 			isa = PBXGroup;
 			children = (
@@ -421,6 +433,8 @@
 		095981C519806A7900807DBE /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				09199FCC1BD973800014376D /* OHHTTPStubsUmbrella.h */,
+				09199FCE1BD974E80014376D /* module.modulemap */,
 				093442DC1B80EC3B00A91535 /* OHHTTPStubs iOS-Info.plist */,
 				095981C619806A7900807DBE /* OHHTTPStubs Mac-Info.plist */,
 			);
@@ -474,6 +488,7 @@
 				0959820119806B1E00807DBE /* OHHTTPStubsResponse+HTTPMessage.h in Headers */,
 				094906DF1B7F60EE00B047DA /* OHHTTPStubs+Mocktail.h in Headers */,
 				095B1AD71AE3138C009D1B56 /* OHPathHelpers.h in Headers */,
+				09199FD01BD974F20014376D /* OHHTTPStubsUmbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -488,6 +503,7 @@
 				725CD9BC1A9EB71D00F84C8B /* OHHTTPStubsResponse+HTTPMessage.h in Headers */,
 				094906DE1B7F60E200B047DA /* OHHTTPStubs+Mocktail.h in Headers */,
 				095B1AD61AE3138C009D1B56 /* OHPathHelpers.h in Headers */,
+				09199FCF1BD974F10014376D /* OHHTTPStubsUmbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -881,7 +897,7 @@
 				725CD9B51A9EB6F800F84C8B /* OHHTTPStubsResponse.m in Sources */,
 				725CD9B71A9EB6FD00F84C8B /* OHHTTPStubsResponse+JSON.m in Sources */,
 				725CD9B61A9EB6FA00F84C8B /* OHHTTPStubsResponse+HTTPMessage.m in Sources */,
-				095925D41BAEBEAA00DD7F0B /* OHHTTPStubsSwift.swift in Sources */,
+				09199FD11BD98D1C0014376D /* OHHTTPStubsSwift.swift in Sources */,
 				095B1AD81AE31395009D1B56 /* OHPathHelpers.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -930,7 +946,6 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
-					"XCODE_VERSION=$(XCODE_VERSION_MAJOR)",
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -941,6 +956,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				MODULEMAP_FILE = "$(SRCROOT)/Supporting Files/module.modulemap";
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -965,17 +981,14 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"XCODE_VERSION=$(XCODE_VERSION_MAJOR)",
-					"$(inherited)",
-				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				MODULEMAP_FILE = "$(SRCROOT)/Supporting Files/module.modulemap";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1008,8 +1021,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "UnitTests/UnitTests-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
 					"$(inherited)",
+					"OHHTTPSTUBS_USE_STATIC_LIBRARY=1",
 				);
 				INFOPLIST_FILE = "UnitTests/UnitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
@@ -1029,6 +1042,11 @@
 			buildSettings = {
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "UnitTests/UnitTests-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"COCOAPODS=1",
+					"OHHTTPSTUBS_USE_STATIC_LIBRARY=1",
+				);
 				INFOPLIST_FILE = "UnitTests/UnitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				OTHER_LDFLAGS = (

diff --git a/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h b/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h
@@ -26,8 +26,8 @@
 /* This category is not available on watchOS because CFNetwork is needed for its implementation but isn't available on Nano */
 #if __has_include(<CFNetwork/CFNetwork.h>)
 
-#import <OHHTTPStubs/OHHTTPStubsResponse.h>
-#import <OHHTTPStubs/Compatibility.h>
+#import "OHHTTPStubsResponse.h"
+#import "Compatibility.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m b/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m
@@ -26,7 +26,7 @@
 #if __has_include(<CFNetwork/CFNetwork.h>)
 #import <CFNetwork/CFNetwork.h>
 
-#import <OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h>
+#import "OHHTTPStubsResponse+HTTPMessage.h"
 
 @implementation OHHTTPStubsResponse (HTTPMessage)
 

diff --git a/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h b/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h
@@ -23,8 +23,8 @@
  ***********************************************************************************/
 
 
-#import <OHHTTPStubs/OHHTTPStubsResponse.h>
-#import <OHHTTPStubs/Compatibility.h>
+#import "OHHTTPStubsResponse.h"
+#import "Compatibility.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m b/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m
@@ -23,7 +23,7 @@
  ***********************************************************************************/
 
 
-#import <OHHTTPStubs/OHHTTPStubsResponse+JSON.h>
+#import "OHHTTPStubsResponse+JSON.h"
 
 @implementation OHHTTPStubsResponse (JSON)
 

diff --git a/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h b/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h
@@ -25,8 +25,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#import <OHHTTPStubs/OHHTTPStubs.h>
-#import <OHHTTPStubs/Compatibility.h>
+#import "OHHTTPStubs.h"
+#import "Compatibility.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m b/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m
@@ -25,7 +25,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#import <OHHTTPStubs/OHHTTPStubs+Mocktail.h>
+#import "OHHTTPStubs+Mocktail.h"
 
 NSString* const MocktailErrorDomain = @"Mocktail";
 

diff --git a/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m b/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m
@@ -22,13 +22,12 @@
  *
  ***********************************************************************************/
 
-
 #import <Foundation/Foundation.h>
 
 #if defined(__IPHONE_7_0) || defined(__MAC_10_9)
-
 #import <objc/runtime.h>
-#import <OHHTTPStubs/OHHTTPStubs.h>
+
+#import "OHHTTPStubs.h"
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.h b/OHHTTPStubs/Sources/OHHTTPStubs.h
@@ -28,9 +28,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import <OHHTTPStubs/Compatibility.h>
-#import <OHHTTPStubs/OHHTTPStubsResponse.h>
-
+#import "Compatibility.h"
+#import "OHHTTPStubsResponse.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -176,24 +175,3 @@ typedef OHHTTPStubsResponse* __nonnull (^OHHTTPStubsResponseBlock)( NSURLRequest
 
 NS_ASSUME_NONNULL_END
 
-
-////////////////////////////////////////////////////////////////////////////////
-#pragma mark - Umbrella Header Imports
-
-
-#if ! __has_include(<OHHTTPStubs/OHHTTPStubs-umbrella.h>)
-  // Because this is supposed to be an umbrella header, we should also import every public headers here
-  // (Except if we use already have a better umbrella header generated by CocoaPods)
-  #if __has_include(<OHHTTPStubs/OHHTTPStubsResponse+JSON.h>)
-    #import <OHHTTPStubs/OHHTTPStubsResponse+JSON.h>
-  #endif
-  #if __has_include(<OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h>)
-    #import <OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h>
-  #endif
-  #if __has_include(<OHHTTPStubs/OHHTTPStubs+Mocktail.h>)
-    #import <OHHTTPStubs/OHHTTPStubs+Mocktail.h>
-  #endif
-  #if __has_include("OHHTTPStubs/OHPathHelpers.h")
-    #import "OHHTTPStubs/OHPathHelpers.h"
-  #endif
-#endif
diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.m b/OHHTTPStubs/Sources/OHHTTPStubs.m
@@ -29,7 +29,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Imports
 
-#import <OHHTTPStubs/OHHTTPStubs.h>
+#import "OHHTTPStubs.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Types & Constants

diff --git a/OHHTTPStubs/Sources/OHHTTPStubsResponse.h b/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
@@ -27,7 +27,8 @@
 #pragma mark - Imports
 
 #import <Foundation/Foundation.h>
-#import <OHHTTPStubs/Compatibility.h>
+
+#import "Compatibility.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Defines & Constants

diff --git a/OHHTTPStubs/Sources/OHHTTPStubsResponse.m b/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
@@ -29,7 +29,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Imports
 
-#import <OHHTTPStubs/OHHTTPStubsResponse.h>
+#import "OHHTTPStubsResponse.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Defines & Constants
@@ -167,7 +167,7 @@ -(instancetype)initWithFileURL:(NSURL *)fileURL
 
     NSNumber *fileSize;
     NSError *error;
-    const BOOL success = [fileURL getResourceValue:&fileSize forKey:NSURLFileSizeKey error:&error];
+    const BOOL success __unused = [fileURL getResourceValue:&fileSize forKey:NSURLFileSizeKey error:&error];
 
     NSAssert(success && fileSize, @"%s Couldn't get the file size for URL. \
 The URL was: %@. \

diff --git a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h
@@ -24,7 +24,8 @@
 
 
 #import <Foundation/Foundation.h>
-#import <OHHTTPStubs/Compatibility.h>
+
+#import "Compatibility.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m
@@ -23,7 +23,7 @@
  ***********************************************************************************/
 
 
-#import <OHHTTPStubs/OHPathHelpers.h>
+#import "OHPathHelpers.h"
 
 NSString* __nullable OHPathForFile(NSString* fileName, Class inBundleForClass)
 {

diff --git a/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift b/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
@@ -124,6 +124,7 @@ public func isExtension(ext: String) -> OHHTTPStubsTestBlock {
  *          (1) using `[q:""]`, which matches a query parameter "?q=" with an empty value, and
  *          (2) using `[q:nil]`, which matches a query parameter "?q" without a value at all
  */
+@available(iOS 8.0, OSX 10.10, *)
 public func containsQueryParams(params: [String:String?]) -> OHHTTPStubsTestBlock {
     return { req in
         if let url = req.URL {

diff --git a/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h b/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h
@@ -0,0 +1,33 @@
+/***********************************************************************************
+ *
+ * Copyright (c) 2012 Olivier Halligon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ ***********************************************************************************/
+
+#import "Compatibility.h"
+#import "OHHTTPStubs.h"
+#import "OHHTTPStubsResponse.h"
+
+#import "OHHTTPStubsResponse+JSON.h"
+#import "OHHTTPStubsResponse+HTTPMessage.h"
+#import "OHHTTPStubs+Mocktail.h"
+#import "OHPathHelpers.h"
+
diff --git a/OHHTTPStubs/Supporting Files/module.modulemap b/OHHTTPStubs/Supporting Files/module.modulemap
@@ -0,0 +1,6 @@
+framework module OHHTTPStubs {
+  umbrella header "OHHTTPStubsUmbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/OHHTTPStubs/UnitTests/OHPathHelpersTests.m b/OHHTTPStubs/UnitTests/OHPathHelpersTests.m
@@ -1,8 +1,13 @@
 #import <XCTest/XCTest.h>
+
+#if OHHTTPSTUBS_USE_STATIC_LIBRARY
 #import "OHHTTPStubs.h"
+#import "OHPathHelpers.h"
+#else
+@import OHHTTPStubs;
+#endif
 
 @interface OHPathHelpersTests : XCTestCase
-
 @end
 
 @implementation OHPathHelpersTests

diff --git a/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m b/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m
@@ -23,7 +23,13 @@
  ***********************************************************************************/
 
 #import <XCTest/XCTest.h>
-#import <OHHTTPStubs/OHHTTPStubs.h>
+
+#if OHHTTPSTUBS_USE_STATIC_LIBRARY
+#import "OHHTTPStubs.h"
+#import "OHHTTPStubsResponse+JSON.h"
+#else
+@import OHHTTPStubs;
+#endif
 
 #import "AFHTTPRequestOperation.h"