From 0f4429c71a7ec8b7140934d02d4e70ed592da1df Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Thu, 22 Oct 2015 21:56:00 +0200 Subject: [PATCH 1/6] Attempt to fix #127 --- .../OHHTTPStubs.xcodeproj/project.pbxproj | 28 +++++++++++++--- OHHTTPStubs/Sources/OHHTTPStubs.h | 26 ++------------- .../Supporting Files/OHHTTPStubsUmbrella.h | 32 +++++++++++++++++++ OHHTTPStubs/Supporting Files/module.modulemap | 6 ++++ 4 files changed, 63 insertions(+), 29 deletions(-) create mode 100644 OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h create mode 100644 OHHTTPStubs/Supporting Files/module.modulemap diff --git a/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj index 7b1a4fa4..d44da33d 100644 --- a/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj +++ b/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj @@ -16,6 +16,8 @@ 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, ); }; }; 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 +44,8 @@ 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 = (); }; }; + 095925D41BAEBEAA00DD7F0B /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0955699A1B90E4EA00503ADC /* OHHTTPStubsSwift.swift */; }; + 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 = ""; }; 09110A731980606A00D175E4 /* OHHTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubsResponse+JSON.m"; sourceTree = ""; }; 09110A781980608600D175E4 /* OHHTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OHHTTPStubs+NSURLSessionConfiguration.m"; sourceTree = ""; }; + 09199FCC1BD973800014376D /* OHHTTPStubsUmbrella.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubsUmbrella.h; sourceTree = ""; }; + 09199FCE1BD974E80014376D /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 093442DC1B80EC3B00A91535 /* OHHTTPStubs iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OHHTTPStubs iOS-Info.plist"; sourceTree = ""; }; 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 = ""; }; @@ -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 = ""; }; + 09199FCD1BD9744C0014376D /* OHHTTPStubs */ = { + isa = PBXGroup; + children = ( + 09110A6A1980605A00D175E4 /* OHHTTPStubs.h */, + 09110A6B1980605A00D175E4 /* OHHTTPStubs.m */, + ); + name = OHHTTPStubs; + sourceTree = ""; + }; 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; }; @@ -941,6 +957,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; }; @@ -976,6 +993,7 @@ 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; }; diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.h b/OHHTTPStubs/Sources/OHHTTPStubs.h index 6c684caa..8c027b04 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubs.h +++ b/OHHTTPStubs/Sources/OHHTTPStubs.h @@ -28,9 +28,8 @@ #import -#import -#import - +#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() - // 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() - #import - #endif - #if __has_include() - #import - #endif - #if __has_include() - #import - #endif - #if __has_include("OHHTTPStubs/OHPathHelpers.h") - #import "OHHTTPStubs/OHPathHelpers.h" - #endif -#endif diff --git a/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h b/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h new file mode 100644 index 00000000..d32a08fe --- /dev/null +++ b/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h @@ -0,0 +1,32 @@ +/*********************************************************************************** + * + * 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 "OHHTTPStubs.h" +#import "OHHTTPStubsResponse.h" + +#import "OHHTTPStubsResponse+JSON.h" +#import +#import +#import + diff --git a/OHHTTPStubs/Supporting Files/module.modulemap b/OHHTTPStubs/Supporting Files/module.modulemap new file mode 100644 index 00000000..50d9508b --- /dev/null +++ b/OHHTTPStubs/Supporting Files/module.modulemap @@ -0,0 +1,6 @@ +framework module OHHTTPStubs { + umbrella header "OHHTTPStubsUmbrella.h" + + export * + module * { export * } +} From 8a457ef98aae91717c121521998c7e242dd96239 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Thu, 22 Oct 2015 23:39:29 +0200 Subject: [PATCH 2/6] Configuration that works with Unit Tests --- .../OHHTTPStubs.xcodeproj/project.pbxproj | 16 ++++++++-------- OHHTTPStubs/Sources/OHHTTPStubs.h | 4 ++-- .../Supporting Files/OHHTTPStubsUmbrella.h | 7 ++++--- OHHTTPStubs/UnitTests/OHPathHelpersTests.m | 7 ++++++- .../UnitTests/Test Suites/AFNetworkingTests.m | 8 +++++++- .../UnitTests/Test Suites/MocktailTests.m | 9 ++++++++- .../Test Suites/NSURLConnectionDelegateTests.m | 7 ++++++- .../UnitTests/Test Suites/NSURLConnectionTests.m | 7 ++++++- .../UnitTests/Test Suites/NSURLSessionTests.m | 8 +++++++- .../UnitTests/Test Suites/NilValuesTests.m | 8 +++++++- OHHTTPStubs/UnitTests/Test Suites/TimingTests.m | 7 ++++++- .../Test Suites/WithContentsOfURLTests.m | 7 ++++++- 12 files changed, 73 insertions(+), 22 deletions(-) diff --git a/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj index d44da33d..ced7f0e1 100644 --- a/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj +++ b/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ 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 */; }; @@ -44,7 +45,6 @@ 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 */; }; 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 */; }; @@ -897,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; @@ -946,7 +946,6 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", - "XCODE_VERSION=$(XCODE_VERSION_MAJOR)", "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -982,10 +981,6 @@ 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; @@ -1026,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; @@ -1047,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/OHHTTPStubs.h b/OHHTTPStubs/Sources/OHHTTPStubs.h index 8c027b04..21db937f 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubs.h +++ b/OHHTTPStubs/Sources/OHHTTPStubs.h @@ -28,8 +28,8 @@ #import -#import "Compatibility.h" -#import "OHHTTPStubsResponse.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h b/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h index d32a08fe..02125106 100644 --- a/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h +++ b/OHHTTPStubs/Supporting Files/OHHTTPStubsUmbrella.h @@ -22,11 +22,12 @@ * ***********************************************************************************/ +#import "Compatibility.h" #import "OHHTTPStubs.h" #import "OHHTTPStubsResponse.h" #import "OHHTTPStubsResponse+JSON.h" -#import -#import -#import +#import "OHHTTPStubsResponse+HTTPMessage.h" +#import "OHHTTPStubs+Mocktail.h" +#import "OHPathHelpers.h" diff --git a/OHHTTPStubs/UnitTests/OHPathHelpersTests.m b/OHHTTPStubs/UnitTests/OHPathHelpersTests.m index 98086fee..d9b25e94 100644 --- a/OHHTTPStubs/UnitTests/OHPathHelpersTests.m +++ b/OHHTTPStubs/UnitTests/OHPathHelpersTests.m @@ -1,8 +1,13 @@ #import + +#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 index a4ee670a..229a4f46 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m @@ -23,7 +23,13 @@ ***********************************************************************************/ #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#import "OHHTTPStubsResponse+JSON.h" +#else +@import OHHTTPStubs; +#endif #import "AFHTTPRequestOperation.h" diff --git a/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m b/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m index db772570..58202be1 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m @@ -26,7 +26,14 @@ //////////////////////////////////////////////////////////////////////////////// #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#import "OHHTTPStubs+Mocktail.h" +#import "OHHTTPStubsResponse+JSON.h" +#else +@import OHHTTPStubs; +#endif @interface MocktailTests : XCTestCase @property(nonatomic, strong) NSURLSession *session; diff --git a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m index 13218541..3fa370db 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m @@ -23,7 +23,12 @@ ***********************************************************************************/ #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#else +@import OHHTTPStubs; +#endif @interface NSURLConnectionDelegateTests : XCTestCase @end diff --git a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m index 1fe6c91e..842591d6 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m @@ -23,7 +23,12 @@ ***********************************************************************************/ #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#else +@import OHHTTPStubs; +#endif @interface NSURLConnectionTests : XCTestCase @end diff --git a/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m b/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m index 2e829ca4..b274ba86 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m @@ -29,7 +29,13 @@ || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090) #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#import "OHHTTPStubsResponse+JSON.h" +#else +@import OHHTTPStubs; +#endif @interface NSURLSessionTests : XCTestCase @end diff --git a/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m b/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m index 9cd0b3ca..d3cc8d08 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m @@ -23,7 +23,13 @@ ***********************************************************************************/ #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#import "OHPathHelpers.h" +#else +@import OHHTTPStubs; +#endif static const NSTimeInterval kResponseTimeTolerence = 0.3; diff --git a/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m b/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m index b2e820f8..aa1dc0c0 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m @@ -24,7 +24,12 @@ #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#else +@import OHHTTPStubs; +#endif @interface TimingTests : XCTestCase { diff --git a/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m b/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m index 0e34aea5..b7538bc4 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m @@ -24,7 +24,12 @@ #import -#import + +#if OHHTTPSTUBS_USE_STATIC_LIBRARY +#import "OHHTTPStubs.h" +#else +@import OHHTTPStubs; +#endif @interface WithContentsOfURLTests : XCTestCase @end From 7300a1b4d017b7f3e716c91df10f1308195a4ea5 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Thu, 22 Oct 2015 23:47:01 +0200 Subject: [PATCH 3/6] Non-modular imports --- .../Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h | 4 ++-- OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h | 4 ++-- OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h | 4 ++-- OHHTTPStubs/Sources/OHHTTPStubs.h | 4 ++-- OHHTTPStubs/Sources/OHHTTPStubsResponse.h | 2 +- OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h b/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h index 2776a4f3..2b94db92 100644 --- 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() -#import -#import +#import "OHHTTPStubsResponse.h" +#import "Compatibility.h" NS_ASSUME_NONNULL_BEGIN diff --git a/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h b/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h index 3069ff32..cdcacb5c 100644 --- a/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h +++ b/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h @@ -23,8 +23,8 @@ ***********************************************************************************/ -#import -#import +#import "OHHTTPStubsResponse.h" +#import "Compatibility.h" NS_ASSUME_NONNULL_BEGIN diff --git a/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h b/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h index 77fe65e8..c7ef6afa 100644 --- a/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h +++ b/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h @@ -25,8 +25,8 @@ //////////////////////////////////////////////////////////////////////////////// -#import -#import +#import "OHHTTPStubs.h" +#import "Compatibility.h" NS_ASSUME_NONNULL_BEGIN diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.h b/OHHTTPStubs/Sources/OHHTTPStubs.h index 21db937f..8c027b04 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubs.h +++ b/OHHTTPStubs/Sources/OHHTTPStubs.h @@ -28,8 +28,8 @@ #import -#import -#import +#import "Compatibility.h" +#import "OHHTTPStubsResponse.h" NS_ASSUME_NONNULL_BEGIN diff --git a/OHHTTPStubs/Sources/OHHTTPStubsResponse.h b/OHHTTPStubs/Sources/OHHTTPStubsResponse.h index 87d7a073..06c31e80 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubsResponse.h +++ b/OHHTTPStubs/Sources/OHHTTPStubsResponse.h @@ -27,7 +27,7 @@ #pragma mark - Imports #import -#import +#import "Compatibility.h" //////////////////////////////////////////////////////////////////////////////// #pragma mark - Defines & Constants diff --git a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h index b3c301ac..b0cd6d65 100644 --- a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h +++ b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h @@ -24,7 +24,7 @@ #import -#import +#import "Compatibility.h" NS_ASSUME_NONNULL_BEGIN From 98de5142dfa08d08b14149d22421e1b30aa857a1 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Fri, 23 Oct 2015 01:07:51 +0200 Subject: [PATCH 4/6] Get some air in the headers --- .../NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m | 3 +-- OHHTTPStubs/Sources/OHHTTPStubsResponse.h | 1 + OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m b/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m index b0e14a09..79099551 100644 --- a/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m +++ b/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m @@ -22,12 +22,11 @@ * ***********************************************************************************/ - #import #if defined(__IPHONE_7_0) || defined(__MAC_10_9) - #import + #import diff --git a/OHHTTPStubs/Sources/OHHTTPStubsResponse.h b/OHHTTPStubs/Sources/OHHTTPStubsResponse.h index 06c31e80..048b38e6 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubsResponse.h +++ b/OHHTTPStubs/Sources/OHHTTPStubsResponse.h @@ -27,6 +27,7 @@ #pragma mark - Imports #import + #import "Compatibility.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h index b0cd6d65..bb4dd952 100644 --- a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h +++ b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h @@ -24,6 +24,7 @@ #import + #import "Compatibility.h" NS_ASSUME_NONNULL_BEGIN From 17bdddbbb1ba0448e918f40399f5a2eeb7064ebe Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Fri, 23 Oct 2015 01:26:13 +0200 Subject: [PATCH 5/6] Use quoted imports in .m files too --- .../Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m | 2 +- OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m | 2 +- OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m | 2 +- .../NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m | 2 +- OHHTTPStubs/Sources/OHHTTPStubs.m | 2 +- OHHTTPStubs/Sources/OHHTTPStubsResponse.m | 2 +- OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m b/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m index 06d7363f..55fd519c 100644 --- a/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m +++ b/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m @@ -26,7 +26,7 @@ #if __has_include() #import -#import +#import "OHHTTPStubsResponse+HTTPMessage.h" @implementation OHHTTPStubsResponse (HTTPMessage) diff --git a/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m b/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m index d88fee9b..9e0e78f7 100644 --- a/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m +++ b/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m @@ -23,7 +23,7 @@ ***********************************************************************************/ -#import +#import "OHHTTPStubsResponse+JSON.h" @implementation OHHTTPStubsResponse (JSON) diff --git a/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m b/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m index 4de8996a..09dd44a5 100644 --- a/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m +++ b/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////////////////////////// -#import +#import "OHHTTPStubs+Mocktail.h" NSString* const MocktailErrorDomain = @"Mocktail"; diff --git a/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m b/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m index 79099551..8f7e6d3a 100644 --- a/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m +++ b/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m @@ -27,7 +27,7 @@ #if defined(__IPHONE_7_0) || defined(__MAC_10_9) #import -#import +#import "OHHTTPStubs.h" ////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.m b/OHHTTPStubs/Sources/OHHTTPStubs.m index b381547c..4fa31f90 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubs.m +++ b/OHHTTPStubs/Sources/OHHTTPStubs.m @@ -29,7 +29,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma mark - Imports -#import +#import "OHHTTPStubs.h" //////////////////////////////////////////////////////////////////////////////// #pragma mark - Types & Constants diff --git a/OHHTTPStubs/Sources/OHHTTPStubsResponse.m b/OHHTTPStubs/Sources/OHHTTPStubsResponse.m index e940eaf3..03e4dba5 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubsResponse.m +++ b/OHHTTPStubs/Sources/OHHTTPStubsResponse.m @@ -29,7 +29,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma mark - Imports -#import +#import "OHHTTPStubsResponse.h" //////////////////////////////////////////////////////////////////////////////// #pragma mark - Defines & Constants diff --git a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m index 18b769e4..89d1e055 100644 --- a/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m +++ b/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m @@ -23,7 +23,7 @@ ***********************************************************************************/ -#import +#import "OHPathHelpers.h" NSString* __nullable OHPathForFile(NSString* fileName, Class inBundleForClass) { From 9e3f69c192fc6f7752f1612efe53ecfd44cbd7e1 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Fri, 23 Oct 2015 02:27:55 +0200 Subject: [PATCH 6/6] Fix warnings + linting errors --- OHHTTPStubs/Sources/OHHTTPStubsResponse.m | 2 +- OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OHHTTPStubs/Sources/OHHTTPStubsResponse.m b/OHHTTPStubs/Sources/OHHTTPStubsResponse.m index 03e4dba5..256878d9 100644 --- a/OHHTTPStubs/Sources/OHHTTPStubsResponse.m +++ b/OHHTTPStubs/Sources/OHHTTPStubsResponse.m @@ -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/Swift/OHHTTPStubsSwift.swift b/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift index 5229dcb8..02b065a7 100644 --- 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 {