From 1ccee133d311395f6f5c7f381beef8f7d6a04c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corut=CC=A6=20Fabrizio?= Date: Mon, 25 Jan 2021 17:43:48 +0200 Subject: [PATCH 1/5] By default, SPM is compiling all the files that are found under Sources/$(PROJ_NAME)/ hence, the HTTPMessage and Mocktail functionalities were not even compiled. Moved them and their includes into the OHHTTPStubs and created a separate folder for the core functionality, in order to keep the files nicely split. --- .../{ => OHHTTPStubs}/HTTPMessage/HTTPStubsResponse+HTTPMessage.m | 0 Sources/{ => OHHTTPStubs}/Mocktail/HTTPStubs+Mocktail.m | 0 .../{ => OHHTTPStubs}/HTTPStubs+NSURLSessionConfiguration.m | 0 Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubs.m | 0 Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsMethodSwizzling.h | 0 Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsMethodSwizzling.m | 0 Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsPathHelpers.m | 0 Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsResponse+JSON.m | 0 Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsResponse.m | 0 .../OHHTTPStubs/{ => OHHTTPStubs}/NSURLRequest+HTTPBodyTesting.m | 0 Sources/{Mocktail => OHHTTPStubs}/include/HTTPStubs+Mocktail.h | 0 .../include/HTTPStubsResponse+HTTPMessage.h | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename Sources/{ => OHHTTPStubs}/HTTPMessage/HTTPStubsResponse+HTTPMessage.m (100%) rename Sources/{ => OHHTTPStubs}/Mocktail/HTTPStubs+Mocktail.m (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubs+NSURLSessionConfiguration.m (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubs.m (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsMethodSwizzling.h (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsMethodSwizzling.m (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsPathHelpers.m (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsResponse+JSON.m (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/HTTPStubsResponse.m (100%) rename Sources/OHHTTPStubs/{ => OHHTTPStubs}/NSURLRequest+HTTPBodyTesting.m (100%) rename Sources/{Mocktail => OHHTTPStubs}/include/HTTPStubs+Mocktail.h (100%) rename Sources/{HTTPMessage => OHHTTPStubs}/include/HTTPStubsResponse+HTTPMessage.h (100%) diff --git a/Sources/HTTPMessage/HTTPStubsResponse+HTTPMessage.m b/Sources/OHHTTPStubs/HTTPMessage/HTTPStubsResponse+HTTPMessage.m similarity index 100% rename from Sources/HTTPMessage/HTTPStubsResponse+HTTPMessage.m rename to Sources/OHHTTPStubs/HTTPMessage/HTTPStubsResponse+HTTPMessage.m diff --git a/Sources/Mocktail/HTTPStubs+Mocktail.m b/Sources/OHHTTPStubs/Mocktail/HTTPStubs+Mocktail.m similarity index 100% rename from Sources/Mocktail/HTTPStubs+Mocktail.m rename to Sources/OHHTTPStubs/Mocktail/HTTPStubs+Mocktail.m diff --git a/Sources/OHHTTPStubs/HTTPStubs+NSURLSessionConfiguration.m b/Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubs+NSURLSessionConfiguration.m similarity index 100% rename from Sources/OHHTTPStubs/HTTPStubs+NSURLSessionConfiguration.m rename to Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubs+NSURLSessionConfiguration.m diff --git a/Sources/OHHTTPStubs/HTTPStubs.m b/Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubs.m similarity index 100% rename from Sources/OHHTTPStubs/HTTPStubs.m rename to Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubs.m diff --git a/Sources/OHHTTPStubs/HTTPStubsMethodSwizzling.h b/Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsMethodSwizzling.h similarity index 100% rename from Sources/OHHTTPStubs/HTTPStubsMethodSwizzling.h rename to Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsMethodSwizzling.h diff --git a/Sources/OHHTTPStubs/HTTPStubsMethodSwizzling.m b/Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsMethodSwizzling.m similarity index 100% rename from Sources/OHHTTPStubs/HTTPStubsMethodSwizzling.m rename to Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsMethodSwizzling.m diff --git a/Sources/OHHTTPStubs/HTTPStubsPathHelpers.m b/Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsPathHelpers.m similarity index 100% rename from Sources/OHHTTPStubs/HTTPStubsPathHelpers.m rename to Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsPathHelpers.m diff --git a/Sources/OHHTTPStubs/HTTPStubsResponse+JSON.m b/Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsResponse+JSON.m similarity index 100% rename from Sources/OHHTTPStubs/HTTPStubsResponse+JSON.m rename to Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsResponse+JSON.m diff --git a/Sources/OHHTTPStubs/HTTPStubsResponse.m b/Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsResponse.m similarity index 100% rename from Sources/OHHTTPStubs/HTTPStubsResponse.m rename to Sources/OHHTTPStubs/OHHTTPStubs/HTTPStubsResponse.m diff --git a/Sources/OHHTTPStubs/NSURLRequest+HTTPBodyTesting.m b/Sources/OHHTTPStubs/OHHTTPStubs/NSURLRequest+HTTPBodyTesting.m similarity index 100% rename from Sources/OHHTTPStubs/NSURLRequest+HTTPBodyTesting.m rename to Sources/OHHTTPStubs/OHHTTPStubs/NSURLRequest+HTTPBodyTesting.m diff --git a/Sources/Mocktail/include/HTTPStubs+Mocktail.h b/Sources/OHHTTPStubs/include/HTTPStubs+Mocktail.h similarity index 100% rename from Sources/Mocktail/include/HTTPStubs+Mocktail.h rename to Sources/OHHTTPStubs/include/HTTPStubs+Mocktail.h diff --git a/Sources/HTTPMessage/include/HTTPStubsResponse+HTTPMessage.h b/Sources/OHHTTPStubs/include/HTTPStubsResponse+HTTPMessage.h similarity index 100% rename from Sources/HTTPMessage/include/HTTPStubsResponse+HTTPMessage.h rename to Sources/OHHTTPStubs/include/HTTPStubsResponse+HTTPMessage.h From b357cbe88c2be9de168abb7395f12391f1701cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corut=CC=A6=20Fabrizio?= Date: Mon, 25 Jan 2021 17:51:53 +0200 Subject: [PATCH 2/5] Fixed pbxproj. --- OHHTTPStubs.xcodeproj/project.pbxproj | 272 ++++++++++++-------------- 1 file changed, 123 insertions(+), 149 deletions(-) diff --git a/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs.xcodeproj/project.pbxproj index ac4e60a5..eb6832aa 100644 --- a/OHHTTPStubs.xcodeproj/project.pbxproj +++ b/OHHTTPStubs.xcodeproj/project.pbxproj @@ -7,6 +7,42 @@ objects = { /* Begin PBXBuildFile section */ + 0595A5E225BF201100EC26A2 /* HTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5D925BF1FD700EC26A2 /* HTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0595A5E325BF201100EC26A2 /* HTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5D825BF1FD700EC26A2 /* HTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0595A5EC25BF201100EC26A2 /* HTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5D925BF1FD700EC26A2 /* HTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0595A5ED25BF201100EC26A2 /* HTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5D825BF1FD700EC26A2 /* HTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0595A5F625BF201200EC26A2 /* HTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5D925BF1FD700EC26A2 /* HTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0595A5F725BF201200EC26A2 /* HTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5D825BF1FD700EC26A2 /* HTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0595A62725BF205300EC26A2 /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B525BF1FD000EC26A2 /* HTTPStubs+Mocktail.m */; }; + 0595A63025BF205300EC26A2 /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B525BF1FD000EC26A2 /* HTTPStubs+Mocktail.m */; }; + 0595A63925BF205400EC26A2 /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B525BF1FD000EC26A2 /* HTTPStubs+Mocktail.m */; }; + 0595A64225BF205800EC26A2 /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B325BF1FD000EC26A2 /* HTTPStubsResponse+HTTPMessage.m */; }; + 0595A64B25BF205900EC26A2 /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B325BF1FD000EC26A2 /* HTTPStubsResponse+HTTPMessage.m */; }; + 0595A65425BF205900EC26A2 /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B325BF1FD000EC26A2 /* HTTPStubsResponse+HTTPMessage.m */; }; + 0595A66525BF206100EC26A2 /* HTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5B925BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.h */; }; + 0595A66625BF206100EC26A2 /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BB25BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.m */; }; + 0595A66725BF206100EC26A2 /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BC25BF1FD000EC26A2 /* HTTPStubsResponse.m */; }; + 0595A66825BF206100EC26A2 /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BA25BF1FD000EC26A2 /* HTTPStubsResponse+JSON.m */; }; + 0595A66925BF206100EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BE25BF1FD000EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m */; }; + 0595A66A25BF206100EC26A2 /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B725BF1FD000EC26A2 /* HTTPStubs.m */; }; + 0595A66B25BF206100EC26A2 /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B825BF1FD000EC26A2 /* NSURLRequest+HTTPBodyTesting.m */; }; + 0595A66C25BF206100EC26A2 /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BD25BF1FD000EC26A2 /* HTTPStubsPathHelpers.m */; }; + 0595A67525BF206200EC26A2 /* HTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5B925BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.h */; }; + 0595A67625BF206200EC26A2 /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BB25BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.m */; }; + 0595A67725BF206200EC26A2 /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BC25BF1FD000EC26A2 /* HTTPStubsResponse.m */; }; + 0595A67825BF206200EC26A2 /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BA25BF1FD000EC26A2 /* HTTPStubsResponse+JSON.m */; }; + 0595A67925BF206200EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BE25BF1FD000EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m */; }; + 0595A67A25BF206200EC26A2 /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B725BF1FD000EC26A2 /* HTTPStubs.m */; }; + 0595A67B25BF206200EC26A2 /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B825BF1FD000EC26A2 /* NSURLRequest+HTTPBodyTesting.m */; }; + 0595A67C25BF206200EC26A2 /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BD25BF1FD000EC26A2 /* HTTPStubsPathHelpers.m */; }; + 0595A68525BF206300EC26A2 /* HTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = 0595A5B925BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.h */; }; + 0595A68625BF206300EC26A2 /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BB25BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.m */; }; + 0595A68725BF206300EC26A2 /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BC25BF1FD000EC26A2 /* HTTPStubsResponse.m */; }; + 0595A68825BF206300EC26A2 /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BA25BF1FD000EC26A2 /* HTTPStubsResponse+JSON.m */; }; + 0595A68925BF206300EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BE25BF1FD000EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m */; }; + 0595A68A25BF206300EC26A2 /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B725BF1FD000EC26A2 /* HTTPStubs.m */; }; + 0595A68B25BF206300EC26A2 /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B825BF1FD000EC26A2 /* NSURLRequest+HTTPBodyTesting.m */; }; + 0595A68C25BF206300EC26A2 /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BD25BF1FD000EC26A2 /* HTTPStubsPathHelpers.m */; }; 09110A4519805F4800D175E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A4419805F4800D175E4 /* Foundation.framework */; }; 09110A5319805F4800D175E4 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A5219805F4800D175E4 /* XCTest.framework */; }; 09110A5419805F4800D175E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A4419805F4800D175E4 /* Foundation.framework */; }; @@ -28,22 +64,6 @@ 1F51F12422FE4D48003463C1 /* SwiftHelpersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F51F12322FE4C53003463C1 /* SwiftHelpersTests.swift */; }; 1F51F12522FE52CA003463C1 /* SwiftHelpersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F51F12322FE4C53003463C1 /* SwiftHelpersTests.swift */; }; 1F51F12622FE52D0003463C1 /* SwiftHelpersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F51F12322FE4C53003463C1 /* SwiftHelpersTests.swift */; }; - 1FB9EFF722FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m */; }; - 1FB9EFF822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m */; }; - 1FB9EFF922FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m */; }; - 1FB9EFFA22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m */; }; - 1FB9EFFB22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE922FFBE670027737A /* HTTPStubsMethodSwizzling.m */; }; - 1FB9EFFC22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE922FFBE670027737A /* HTTPStubsMethodSwizzling.m */; }; - 1FB9EFFD22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE922FFBE670027737A /* HTTPStubsMethodSwizzling.m */; }; - 1FB9EFFE22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFE922FFBE670027737A /* HTTPStubsMethodSwizzling.m */; }; - 1FB9EFFF22FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEA22FFBE670027737A /* HTTPStubsPathHelpers.m */; }; - 1FB9F00022FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEA22FFBE670027737A /* HTTPStubsPathHelpers.m */; }; - 1FB9F00122FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEA22FFBE670027737A /* HTTPStubsPathHelpers.m */; }; - 1FB9F00222FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEA22FFBE670027737A /* HTTPStubsPathHelpers.m */; }; - 1FB9F00322FFBE670027737A /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEB22FFBE670027737A /* HTTPStubs.m */; }; - 1FB9F00422FFBE670027737A /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEB22FFBE670027737A /* HTTPStubs.m */; }; - 1FB9F00522FFBE670027737A /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEB22FFBE670027737A /* HTTPStubs.m */; }; - 1FB9F00622FFBE670027737A /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFEB22FFBE670027737A /* HTTPStubs.m */; }; 1FB9F00722FFBE670027737A /* Compatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFED22FFBE670027737A /* Compatibility.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FB9F00822FFBE670027737A /* Compatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFED22FFBE670027737A /* Compatibility.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FB9F00922FFBE670027737A /* Compatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFED22FFBE670027737A /* Compatibility.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -62,21 +82,6 @@ 1FB9F01622FFBE670027737A /* HTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFF222FFBE670027737A /* HTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FB9F01722FFBE670027737A /* HTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFF222FFBE670027737A /* HTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FB9F01822FFBE670027737A /* HTTPStubsResponse+JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFF222FFBE670027737A /* HTTPStubsResponse+JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1FB9F01922FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF322FFBE670027737A /* HTTPStubsResponse+JSON.m */; }; - 1FB9F01A22FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF322FFBE670027737A /* HTTPStubsResponse+JSON.m */; }; - 1FB9F01B22FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF322FFBE670027737A /* HTTPStubsResponse+JSON.m */; }; - 1FB9F01C22FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF322FFBE670027737A /* HTTPStubsResponse+JSON.m */; }; - 1FB9F01D22FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF422FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m */; }; - 1FB9F01E22FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF422FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m */; }; - 1FB9F01F22FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF422FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m */; }; - 1FB9F02022FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF422FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m */; }; - 1FB9F02122FFBE670027737A /* HTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFF522FFBE670027737A /* HTTPStubsMethodSwizzling.h */; }; - 1FB9F02222FFBE670027737A /* HTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFF522FFBE670027737A /* HTTPStubsMethodSwizzling.h */; }; - 1FB9F02322FFBE670027737A /* HTTPStubsMethodSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB9EFF522FFBE670027737A /* HTTPStubsMethodSwizzling.h */; }; - 1FB9F02422FFBE670027737A /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF622FFBE670027737A /* HTTPStubsResponse.m */; }; - 1FB9F02522FFBE670027737A /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF622FFBE670027737A /* HTTPStubsResponse.m */; }; - 1FB9F02622FFBE670027737A /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF622FFBE670027737A /* HTTPStubsResponse.m */; }; - 1FB9F02722FFBE670027737A /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9EFF622FFBE670027737A /* HTTPStubsResponse.m */; }; 1FB9F02822FFBFB00027737A /* OHHTTPStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC5CD022FD95CC00472F5B /* OHHTTPStubs.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1FB9F03222FFC0CF0027737A /* NSURLConnectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */; }; 1FB9F03322FFC0CF0027737A /* NSURLConnectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */; }; @@ -110,20 +115,6 @@ 1FB9F04F22FFC0CF0027737A /* NilValuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */; }; 1FB9F05022FFC0CF0027737A /* NilValuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */; }; 1FB9F05122FFC0CF0027737A /* NilValuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */; }; - 1FCC5C9C22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC5C7422FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1FCC5C9D22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC5C7422FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1FCC5C9E22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC5C7422FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1FCC5C9F22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7522FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m */; }; - 1FCC5CA022FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7522FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m */; }; - 1FCC5CA122FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7522FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m */; }; - 1FCC5CA222FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7522FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m */; }; - 1FCC5CA322FD95C200472F5B /* HTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC5C7822FD95C200472F5B /* HTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1FCC5CA422FD95C200472F5B /* HTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC5C7822FD95C200472F5B /* HTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1FCC5CA522FD95C200472F5B /* HTTPStubs+Mocktail.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC5C7822FD95C200472F5B /* HTTPStubs+Mocktail.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1FCC5CA622FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7922FD95C200472F5B /* HTTPStubs+Mocktail.m */; }; - 1FCC5CA722FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7922FD95C200472F5B /* HTTPStubs+Mocktail.m */; }; - 1FCC5CA822FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7922FD95C200472F5B /* HTTPStubs+Mocktail.m */; }; - 1FCC5CA922FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C7922FD95C200472F5B /* HTTPStubs+Mocktail.m */; }; 1FCC5CB922FD95C200472F5B /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C8322FD95C200472F5B /* OHHTTPStubsSwift.swift */; }; 1FCC5CBA22FD95C200472F5B /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C8322FD95C200472F5B /* OHHTTPStubsSwift.swift */; }; 1FCC5CBB22FD95C200472F5B /* OHHTTPStubsSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC5C8322FD95C200472F5B /* OHHTTPStubsSwift.swift */; }; @@ -204,6 +195,18 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0595A5B325BF1FD000EC26A2 /* HTTPStubsResponse+HTTPMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubsResponse+HTTPMessage.m"; sourceTree = ""; }; + 0595A5B525BF1FD000EC26A2 /* HTTPStubs+Mocktail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubs+Mocktail.m"; sourceTree = ""; }; + 0595A5B725BF1FD000EC26A2 /* HTTPStubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubs.m; sourceTree = ""; }; + 0595A5B825BF1FD000EC26A2 /* NSURLRequest+HTTPBodyTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLRequest+HTTPBodyTesting.m"; sourceTree = ""; }; + 0595A5B925BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPStubsMethodSwizzling.h; sourceTree = ""; }; + 0595A5BA25BF1FD000EC26A2 /* HTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubsResponse+JSON.m"; sourceTree = ""; }; + 0595A5BB25BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubsMethodSwizzling.m; sourceTree = ""; }; + 0595A5BC25BF1FD000EC26A2 /* HTTPStubsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubsResponse.m; sourceTree = ""; }; + 0595A5BD25BF1FD000EC26A2 /* HTTPStubsPathHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubsPathHelpers.m; sourceTree = ""; }; + 0595A5BE25BF1FD000EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubs+NSURLSessionConfiguration.m"; sourceTree = ""; }; + 0595A5D825BF1FD700EC26A2 /* HTTPStubs+Mocktail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HTTPStubs+Mocktail.h"; sourceTree = ""; }; + 0595A5D925BF1FD700EC26A2 /* HTTPStubsResponse+HTTPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HTTPStubsResponse+HTTPMessage.h"; sourceTree = ""; }; 070E9B74647A6F3AE67C97A7 /* Pods-TestingPods-OHHTTPStubs Mac Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TestingPods-OHHTTPStubs Mac Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-TestingPods-OHHTTPStubs Mac Tests/Pods-TestingPods-OHHTTPStubs Mac Tests.release.xcconfig"; sourceTree = ""; }; 09110A4119805F4800D175E4 /* libOHHTTPStubs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOHHTTPStubs.a; sourceTree = BUILT_PRODUCTS_DIR; }; 09110A4419805F4800D175E4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -217,20 +220,12 @@ 095981D219806A7900807DBE /* OHHTTPStubs Mac Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OHHTTPStubs Mac Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 1F462BB722FD96C6000B7253 /* MocktailFolder */ = {isa = PBXFileReference; lastKnownFileType = folder; path = MocktailFolder; sourceTree = ""; }; 1F51F12322FE4C53003463C1 /* SwiftHelpersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftHelpersTests.swift; sourceTree = ""; }; - 1FB9EFE822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLRequest+HTTPBodyTesting.m"; sourceTree = ""; }; - 1FB9EFE922FFBE670027737A /* HTTPStubsMethodSwizzling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubsMethodSwizzling.m; sourceTree = ""; }; - 1FB9EFEA22FFBE670027737A /* HTTPStubsPathHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubsPathHelpers.m; sourceTree = ""; }; - 1FB9EFEB22FFBE670027737A /* HTTPStubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubs.m; sourceTree = ""; }; 1FB9EFED22FFBE670027737A /* Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compatibility.h; sourceTree = ""; }; 1FB9EFEE22FFBE670027737A /* HTTPStubsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPStubsResponse.h; sourceTree = ""; }; 1FB9EFEF22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLRequest+HTTPBodyTesting.h"; sourceTree = ""; }; 1FB9EFF022FFBE670027737A /* HTTPStubsPathHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPStubsPathHelpers.h; sourceTree = ""; }; 1FB9EFF122FFBE670027737A /* HTTPStubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPStubs.h; sourceTree = ""; }; 1FB9EFF222FFBE670027737A /* HTTPStubsResponse+JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HTTPStubsResponse+JSON.h"; sourceTree = ""; }; - 1FB9EFF322FFBE670027737A /* HTTPStubsResponse+JSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubsResponse+JSON.m"; sourceTree = ""; }; - 1FB9EFF422FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubs+NSURLSessionConfiguration.m"; sourceTree = ""; }; - 1FB9EFF522FFBE670027737A /* HTTPStubsMethodSwizzling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPStubsMethodSwizzling.h; sourceTree = ""; }; - 1FB9EFF622FFBE670027737A /* HTTPStubsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPStubsResponse.m; sourceTree = ""; }; 1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSURLConnectionTests.m; sourceTree = ""; }; 1FB9F02B22FFC0CF0027737A /* NSURLSessionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSURLSessionTests.m; sourceTree = ""; }; 1FB9F02C22FFC0CF0027737A /* TimingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimingTests.m; sourceTree = ""; }; @@ -239,10 +234,6 @@ 1FB9F02F22FFC0CF0027737A /* WithContentsOfURLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WithContentsOfURLTests.m; sourceTree = ""; }; 1FB9F03022FFC0CF0027737A /* NSURLConnectionDelegateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSURLConnectionDelegateTests.m; sourceTree = ""; }; 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NilValuesTests.m; sourceTree = ""; }; - 1FCC5C7422FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HTTPStubsResponse+HTTPMessage.h"; sourceTree = ""; }; - 1FCC5C7522FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubsResponse+HTTPMessage.m"; sourceTree = ""; }; - 1FCC5C7822FD95C200472F5B /* HTTPStubs+Mocktail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HTTPStubs+Mocktail.h"; sourceTree = ""; }; - 1FCC5C7922FD95C200472F5B /* HTTPStubs+Mocktail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HTTPStubs+Mocktail.m"; sourceTree = ""; }; 1FCC5C8322FD95C200472F5B /* OHHTTPStubsSwift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OHHTTPStubsSwift.swift; sourceTree = ""; }; 1FCC5CCF22FD95CC00472F5B /* OHHTTPStubs Mac-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OHHTTPStubs Mac-Info.plist"; sourceTree = ""; }; 1FCC5CD022FD95CC00472F5B /* OHHTTPStubs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHHTTPStubs.h; sourceTree = ""; }; @@ -349,6 +340,37 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0595A5B225BF1FD000EC26A2 /* HTTPMessage */ = { + isa = PBXGroup; + children = ( + 0595A5B325BF1FD000EC26A2 /* HTTPStubsResponse+HTTPMessage.m */, + ); + path = HTTPMessage; + sourceTree = ""; + }; + 0595A5B425BF1FD000EC26A2 /* Mocktail */ = { + isa = PBXGroup; + children = ( + 0595A5B525BF1FD000EC26A2 /* HTTPStubs+Mocktail.m */, + ); + path = Mocktail; + sourceTree = ""; + }; + 0595A5B625BF1FD000EC26A2 /* OHHTTPStubs */ = { + isa = PBXGroup; + children = ( + 0595A5B725BF1FD000EC26A2 /* HTTPStubs.m */, + 0595A5B825BF1FD000EC26A2 /* NSURLRequest+HTTPBodyTesting.m */, + 0595A5B925BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.h */, + 0595A5BA25BF1FD000EC26A2 /* HTTPStubsResponse+JSON.m */, + 0595A5BB25BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.m */, + 0595A5BC25BF1FD000EC26A2 /* HTTPStubsResponse.m */, + 0595A5BD25BF1FD000EC26A2 /* HTTPStubsPathHelpers.m */, + 0595A5BE25BF1FD000EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m */, + ); + path = OHHTTPStubs; + sourceTree = ""; + }; 09110A3819805F4800D175E4 = { isa = PBXGroup; children = ( @@ -424,15 +446,10 @@ 1FB9EFE722FFBE670027737A /* OHHTTPStubs */ = { isa = PBXGroup; children = ( - 1FB9EFE822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m */, - 1FB9EFE922FFBE670027737A /* HTTPStubsMethodSwizzling.m */, - 1FB9EFEA22FFBE670027737A /* HTTPStubsPathHelpers.m */, - 1FB9EFEB22FFBE670027737A /* HTTPStubs.m */, + 0595A5B225BF1FD000EC26A2 /* HTTPMessage */, 1FB9EFEC22FFBE670027737A /* include */, - 1FB9EFF322FFBE670027737A /* HTTPStubsResponse+JSON.m */, - 1FB9EFF422FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m */, - 1FB9EFF522FFBE670027737A /* HTTPStubsMethodSwizzling.h */, - 1FB9EFF622FFBE670027737A /* HTTPStubsResponse.m */, + 0595A5B425BF1FD000EC26A2 /* Mocktail */, + 0595A5B625BF1FD000EC26A2 /* OHHTTPStubs */, ); name = OHHTTPStubs; path = Sources/OHHTTPStubs; @@ -442,11 +459,13 @@ isa = PBXGroup; children = ( 1FB9EFED22FFBE670027737A /* Compatibility.h */, - 1FB9EFEE22FFBE670027737A /* HTTPStubsResponse.h */, - 1FB9EFEF22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.h */, - 1FB9EFF022FFBE670027737A /* HTTPStubsPathHelpers.h */, 1FB9EFF122FFBE670027737A /* HTTPStubs.h */, + 0595A5D825BF1FD700EC26A2 /* HTTPStubs+Mocktail.h */, + 1FB9EFF022FFBE670027737A /* HTTPStubsPathHelpers.h */, + 1FB9EFEE22FFBE670027737A /* HTTPStubsResponse.h */, + 0595A5D925BF1FD700EC26A2 /* HTTPStubsResponse+HTTPMessage.h */, 1FB9EFF222FFBE670027737A /* HTTPStubsResponse+JSON.h */, + 1FB9EFEF22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.h */, ); path = include; sourceTree = ""; @@ -469,8 +488,6 @@ 1FCC5C6A22FD95C200472F5B /* Sources */ = { isa = PBXGroup; children = ( - 1FCC5C7222FD95C200472F5B /* HTTPMessage */, - 1FCC5C7622FD95C200472F5B /* Mocktail */, 1FB9EFE722FFBE670027737A /* OHHTTPStubs */, 1FCC5C8222FD95C200472F5B /* OHHTTPStubsSwift */, 1FCC5CCE22FD95CC00472F5B /* Supporting Files */, @@ -478,40 +495,6 @@ path = Sources; sourceTree = ""; }; - 1FCC5C7222FD95C200472F5B /* HTTPMessage */ = { - isa = PBXGroup; - children = ( - 1FCC5C7322FD95C200472F5B /* include */, - 1FCC5C7522FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m */, - ); - path = HTTPMessage; - sourceTree = ""; - }; - 1FCC5C7322FD95C200472F5B /* include */ = { - isa = PBXGroup; - children = ( - 1FCC5C7422FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h */, - ); - path = include; - sourceTree = ""; - }; - 1FCC5C7622FD95C200472F5B /* Mocktail */ = { - isa = PBXGroup; - children = ( - 1FCC5C7722FD95C200472F5B /* include */, - 1FCC5C7922FD95C200472F5B /* HTTPStubs+Mocktail.m */, - ); - path = Mocktail; - sourceTree = ""; - }; - 1FCC5C7722FD95C200472F5B /* include */ = { - isa = PBXGroup; - children = ( - 1FCC5C7822FD95C200472F5B /* HTTPStubs+Mocktail.h */, - ); - path = include; - sourceTree = ""; - }; 1FCC5C8222FD95C200472F5B /* OHHTTPStubsSwift */ = { isa = PBXGroup; children = ( @@ -588,14 +571,14 @@ files = ( 1FB9F00822FFBE670027737A /* Compatibility.h in Headers */, 1FB9F01422FFBE670027737A /* HTTPStubs.h in Headers */, + 0595A5ED25BF201100EC26A2 /* HTTPStubs+Mocktail.h in Headers */, 1FB9F00B22FFBE670027737A /* HTTPStubsResponse.h in Headers */, 1FB9F01722FFBE670027737A /* HTTPStubsResponse+JSON.h in Headers */, - 1FCC5C9D22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h in Headers */, - 1FCC5CA422FD95C200472F5B /* HTTPStubs+Mocktail.h in Headers */, + 0595A67525BF206200EC26A2 /* HTTPStubsMethodSwizzling.h in Headers */, 1FB9F01122FFBE670027737A /* HTTPStubsPathHelpers.h in Headers */, + 0595A5EC25BF201100EC26A2 /* HTTPStubsResponse+HTTPMessage.h in Headers */, 1FB9F00E22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.h in Headers */, 1F462BBF22FD9B8F000B7253 /* OHHTTPStubs.h in Headers */, - 1FB9F02222FFBE670027737A /* HTTPStubsMethodSwizzling.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -605,14 +588,14 @@ files = ( 1FB9F00722FFBE670027737A /* Compatibility.h in Headers */, 1FB9F01322FFBE670027737A /* HTTPStubs.h in Headers */, + 0595A5F725BF201200EC26A2 /* HTTPStubs+Mocktail.h in Headers */, 1FB9F00A22FFBE670027737A /* HTTPStubsResponse.h in Headers */, 1FB9F01622FFBE670027737A /* HTTPStubsResponse+JSON.h in Headers */, - 1FCC5C9C22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h in Headers */, - 1FCC5CA322FD95C200472F5B /* HTTPStubs+Mocktail.h in Headers */, + 0595A66525BF206100EC26A2 /* HTTPStubsMethodSwizzling.h in Headers */, 1FB9F01022FFBE670027737A /* HTTPStubsPathHelpers.h in Headers */, + 0595A5F625BF201200EC26A2 /* HTTPStubsResponse+HTTPMessage.h in Headers */, 1FB9F00D22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.h in Headers */, 1FB9F02822FFBFB00027737A /* OHHTTPStubs.h in Headers */, - 1FB9F02122FFBE670027737A /* HTTPStubsMethodSwizzling.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -622,14 +605,14 @@ files = ( 1FB9F00922FFBE670027737A /* Compatibility.h in Headers */, 1FB9F01522FFBE670027737A /* HTTPStubs.h in Headers */, + 0595A5E325BF201100EC26A2 /* HTTPStubs+Mocktail.h in Headers */, 1FB9F00C22FFBE670027737A /* HTTPStubsResponse.h in Headers */, 1FB9F01822FFBE670027737A /* HTTPStubsResponse+JSON.h in Headers */, - 1FCC5C9E22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.h in Headers */, - 1FCC5CA522FD95C200472F5B /* HTTPStubs+Mocktail.h in Headers */, + 0595A68525BF206300EC26A2 /* HTTPStubsMethodSwizzling.h in Headers */, 1FB9F01222FFBE670027737A /* HTTPStubsPathHelpers.h in Headers */, + 0595A5E225BF201100EC26A2 /* HTTPStubsResponse+HTTPMessage.h in Headers */, 1FB9F00F22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.h in Headers */, 1F462BC022FD9CC8000B7253 /* OHHTTPStubs.h in Headers */, - 1FB9F02322FFBE670027737A /* HTTPStubsMethodSwizzling.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -999,15 +982,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1FB9EFF722FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */, - 1FB9EFFB22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */, - 1FB9F00322FFBE670027737A /* HTTPStubs.m in Sources */, - 1FB9F01D22FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, - 1FCC5CA622FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */, - 1FB9F02422FFBE670027737A /* HTTPStubsResponse.m in Sources */, - 1FB9F01922FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */, - 1FCC5C9F22FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */, - 1FB9EFFF22FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1048,16 +1022,16 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1FB9F00522FFBE670027737A /* HTTPStubs.m in Sources */, - 1FB9F01F22FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, - 1FCC5CA822FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */, - 1FB9EFFD22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */, - 1FB9F02622FFBE670027737A /* HTTPStubsResponse.m in Sources */, - 1FB9F01B22FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */, - 1FCC5CA122FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */, + 0595A67825BF206200EC26A2 /* HTTPStubsResponse+JSON.m in Sources */, + 0595A67625BF206200EC26A2 /* HTTPStubsMethodSwizzling.m in Sources */, + 0595A67C25BF206200EC26A2 /* HTTPStubsPathHelpers.m in Sources */, + 0595A64B25BF205900EC26A2 /* HTTPStubsResponse+HTTPMessage.m in Sources */, 1FCC5CBA22FD95C200472F5B /* OHHTTPStubsSwift.swift in Sources */, - 1FB9F00122FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */, - 1FB9EFF922FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */, + 0595A67925BF206200EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, + 0595A63025BF205300EC26A2 /* HTTPStubs+Mocktail.m in Sources */, + 0595A67B25BF206200EC26A2 /* NSURLRequest+HTTPBodyTesting.m in Sources */, + 0595A67725BF206200EC26A2 /* HTTPStubsResponse.m in Sources */, + 0595A67A25BF206200EC26A2 /* HTTPStubs.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1082,16 +1056,16 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1FB9F00422FFBE670027737A /* HTTPStubs.m in Sources */, - 1FB9F01E22FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, - 1FCC5CA722FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */, - 1FB9EFFC22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */, - 1FB9F02522FFBE670027737A /* HTTPStubsResponse.m in Sources */, - 1FB9F01A22FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */, - 1FCC5CA022FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */, + 0595A66825BF206100EC26A2 /* HTTPStubsResponse+JSON.m in Sources */, + 0595A66625BF206100EC26A2 /* HTTPStubsMethodSwizzling.m in Sources */, + 0595A66C25BF206100EC26A2 /* HTTPStubsPathHelpers.m in Sources */, + 0595A65425BF205900EC26A2 /* HTTPStubsResponse+HTTPMessage.m in Sources */, 1FCC5CB922FD95C200472F5B /* OHHTTPStubsSwift.swift in Sources */, - 1FB9F00022FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */, - 1FB9EFF822FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */, + 0595A66925BF206100EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, + 0595A62725BF205300EC26A2 /* HTTPStubs+Mocktail.m in Sources */, + 0595A66B25BF206100EC26A2 /* NSURLRequest+HTTPBodyTesting.m in Sources */, + 0595A66725BF206100EC26A2 /* HTTPStubsResponse.m in Sources */, + 0595A66A25BF206100EC26A2 /* HTTPStubs.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1116,16 +1090,16 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1FB9F00622FFBE670027737A /* HTTPStubs.m in Sources */, - 1FB9F02022FFBE670027737A /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, - 1FCC5CA922FD95C200472F5B /* HTTPStubs+Mocktail.m in Sources */, - 1FB9EFFE22FFBE670027737A /* HTTPStubsMethodSwizzling.m in Sources */, - 1FB9F02722FFBE670027737A /* HTTPStubsResponse.m in Sources */, - 1FB9F01C22FFBE670027737A /* HTTPStubsResponse+JSON.m in Sources */, - 1FCC5CA222FD95C200472F5B /* HTTPStubsResponse+HTTPMessage.m in Sources */, + 0595A68825BF206300EC26A2 /* HTTPStubsResponse+JSON.m in Sources */, + 0595A68625BF206300EC26A2 /* HTTPStubsMethodSwizzling.m in Sources */, + 0595A68C25BF206300EC26A2 /* HTTPStubsPathHelpers.m in Sources */, + 0595A64225BF205800EC26A2 /* HTTPStubsResponse+HTTPMessage.m in Sources */, 1FCC5CBB22FD95C200472F5B /* OHHTTPStubsSwift.swift in Sources */, - 1FB9F00222FFBE670027737A /* HTTPStubsPathHelpers.m in Sources */, - 1FB9EFFA22FFBE670027737A /* NSURLRequest+HTTPBodyTesting.m in Sources */, + 0595A68925BF206300EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, + 0595A63925BF205400EC26A2 /* HTTPStubs+Mocktail.m in Sources */, + 0595A68B25BF206300EC26A2 /* NSURLRequest+HTTPBodyTesting.m in Sources */, + 0595A68725BF206300EC26A2 /* HTTPStubsResponse.m in Sources */, + 0595A68A25BF206300EC26A2 /* HTTPStubs.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 8136a6f5d9c313311f172fcb4ae33eeb121f60d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corut=CC=A6=20Fabrizio?= Date: Tue, 26 Jan 2021 00:47:28 +0200 Subject: [PATCH 3/5] Add .m files to the Static Lib target as well. --- OHHTTPStubs.xcodeproj/project.pbxproj | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs.xcodeproj/project.pbxproj index eb6832aa..379ddf59 100644 --- a/OHHTTPStubs.xcodeproj/project.pbxproj +++ b/OHHTTPStubs.xcodeproj/project.pbxproj @@ -43,6 +43,15 @@ 0595A68A25BF206300EC26A2 /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B725BF1FD000EC26A2 /* HTTPStubs.m */; }; 0595A68B25BF206300EC26A2 /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B825BF1FD000EC26A2 /* NSURLRequest+HTTPBodyTesting.m */; }; 0595A68C25BF206300EC26A2 /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BD25BF1FD000EC26A2 /* HTTPStubsPathHelpers.m */; }; + 05F728B525BF81B000549B1D /* HTTPStubsResponse+HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B325BF1FD000EC26A2 /* HTTPStubsResponse+HTTPMessage.m */; }; + 05F728BE25BF81B900549B1D /* HTTPStubs+Mocktail.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B525BF1FD000EC26A2 /* HTTPStubs+Mocktail.m */; }; + 05F728C725BF81C300549B1D /* HTTPStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B725BF1FD000EC26A2 /* HTTPStubs.m */; }; + 05F728C825BF81C300549B1D /* NSURLRequest+HTTPBodyTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5B825BF1FD000EC26A2 /* NSURLRequest+HTTPBodyTesting.m */; }; + 05F728D125BF81C800549B1D /* HTTPStubsResponse+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BA25BF1FD000EC26A2 /* HTTPStubsResponse+JSON.m */; }; + 05F728D225BF81C800549B1D /* HTTPStubsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BC25BF1FD000EC26A2 /* HTTPStubsResponse.m */; }; + 05F728D325BF81C800549B1D /* HTTPStubsPathHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BD25BF1FD000EC26A2 /* HTTPStubsPathHelpers.m */; }; + 05F728D425BF81C800549B1D /* HTTPStubs+NSURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BE25BF1FD000EC26A2 /* HTTPStubs+NSURLSessionConfiguration.m */; }; + 05F728D525BF81C800549B1D /* HTTPStubsMethodSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 0595A5BB25BF1FD000EC26A2 /* HTTPStubsMethodSwizzling.m */; }; 09110A4519805F4800D175E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A4419805F4800D175E4 /* Foundation.framework */; }; 09110A5319805F4800D175E4 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A5219805F4800D175E4 /* XCTest.framework */; }; 09110A5419805F4800D175E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09110A4419805F4800D175E4 /* Foundation.framework */; }; @@ -982,6 +991,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 05F728D225BF81C800549B1D /* HTTPStubsResponse.m in Sources */, + 05F728B525BF81B000549B1D /* HTTPStubsResponse+HTTPMessage.m in Sources */, + 05F728D125BF81C800549B1D /* HTTPStubsResponse+JSON.m in Sources */, + 05F728D325BF81C800549B1D /* HTTPStubsPathHelpers.m in Sources */, + 05F728D425BF81C800549B1D /* HTTPStubs+NSURLSessionConfiguration.m in Sources */, + 05F728D525BF81C800549B1D /* HTTPStubsMethodSwizzling.m in Sources */, + 05F728C825BF81C300549B1D /* NSURLRequest+HTTPBodyTesting.m in Sources */, + 05F728BE25BF81B900549B1D /* HTTPStubs+Mocktail.m in Sources */, + 05F728C725BF81C300549B1D /* HTTPStubs.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From bdb49c5cdae1993f391aa85e17e61e2ac4e9b958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corut=CC=A6=20Fabrizio?= Date: Tue, 26 Jan 2021 00:56:36 +0200 Subject: [PATCH 4/5] Fixed running Mocktail tests using `swift test` for Swift Packages. The same principles applies to the tests as well: only files found in the Tests/$(PACKAGE_NAME)Tests folder will be taken into consideration. --- OHHTTPStubs.xcodeproj/project.pbxproj | 26 ++++++++++++------- .../MocktailTests/MocktailTests.m | 0 .../AFNetworkingTests.m | 0 .../NSURLConnectionDelegateTests.m | 0 .../NSURLConnectionTests.m | 0 .../NSURLSessionTests.m | 0 .../{ => OHHTTPStubsTests}/NilValuesTests.m | 0 .../OHPathHelpersTests.m | 0 .../{ => OHHTTPStubsTests}/TimingTests.m | 0 .../WithContentsOfURLTests.m | 0 10 files changed, 17 insertions(+), 9 deletions(-) rename Tests/{ => OHHTTPStubsTests}/MocktailTests/MocktailTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/AFNetworkingTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/NSURLConnectionDelegateTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/NSURLConnectionTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/NSURLSessionTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/NilValuesTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/OHPathHelpersTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/TimingTests.m (100%) rename Tests/OHHTTPStubsTests/{ => OHHTTPStubsTests}/WithContentsOfURLTests.m (100%) diff --git a/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs.xcodeproj/project.pbxproj index 379ddf59..3064acde 100644 --- a/OHHTTPStubs.xcodeproj/project.pbxproj +++ b/OHHTTPStubs.xcodeproj/project.pbxproj @@ -380,6 +380,21 @@ path = OHHTTPStubs; sourceTree = ""; }; + 05F728E625BF83A600549B1D /* OHHTTPStubsTests */ = { + isa = PBXGroup; + children = ( + 1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */, + 1FB9F02B22FFC0CF0027737A /* NSURLSessionTests.m */, + 1FB9F02C22FFC0CF0027737A /* TimingTests.m */, + 1FB9F02D22FFC0CF0027737A /* OHPathHelpersTests.m */, + 1FB9F02E22FFC0CF0027737A /* AFNetworkingTests.m */, + 1FB9F02F22FFC0CF0027737A /* WithContentsOfURLTests.m */, + 1FB9F03022FFC0CF0027737A /* NSURLConnectionDelegateTests.m */, + 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */, + ); + path = OHHTTPStubsTests; + sourceTree = ""; + }; 09110A3819805F4800D175E4 = { isa = PBXGroup; children = ( @@ -482,14 +497,8 @@ 1FB9F02922FFC0CF0027737A /* OHHTTPStubsTests */ = { isa = PBXGroup; children = ( - 1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */, - 1FB9F02B22FFC0CF0027737A /* NSURLSessionTests.m */, - 1FB9F02C22FFC0CF0027737A /* TimingTests.m */, - 1FB9F02D22FFC0CF0027737A /* OHPathHelpersTests.m */, - 1FB9F02E22FFC0CF0027737A /* AFNetworkingTests.m */, - 1FB9F02F22FFC0CF0027737A /* WithContentsOfURLTests.m */, - 1FB9F03022FFC0CF0027737A /* NSURLConnectionDelegateTests.m */, - 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */, + 1FCC5CED22FD95D700472F5B /* MocktailTests */, + 05F728E625BF83A600549B1D /* OHHTTPStubsTests */, ); path = OHHTTPStubsTests; sourceTree = ""; @@ -526,7 +535,6 @@ isa = PBXGroup; children = ( 1FCC5CE222FD95D700472F5B /* Fixtures */, - 1FCC5CED22FD95D700472F5B /* MocktailTests */, 1FB9F02922FFC0CF0027737A /* OHHTTPStubsTests */, 1F51F12222FE4C53003463C1 /* OHHTTPStubsSwiftTests */, 1F462BBD22FD9765000B7253 /* Supporting Files */, diff --git a/Tests/MocktailTests/MocktailTests.m b/Tests/OHHTTPStubsTests/MocktailTests/MocktailTests.m similarity index 100% rename from Tests/MocktailTests/MocktailTests.m rename to Tests/OHHTTPStubsTests/MocktailTests/MocktailTests.m diff --git a/Tests/OHHTTPStubsTests/AFNetworkingTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/AFNetworkingTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/AFNetworkingTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/AFNetworkingTests.m diff --git a/Tests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m diff --git a/Tests/OHHTTPStubsTests/NSURLConnectionTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/NSURLConnectionTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionTests.m diff --git a/Tests/OHHTTPStubsTests/NSURLSessionTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLSessionTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/NSURLSessionTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLSessionTests.m diff --git a/Tests/OHHTTPStubsTests/NilValuesTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NilValuesTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/NilValuesTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/NilValuesTests.m diff --git a/Tests/OHHTTPStubsTests/OHPathHelpersTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/OHPathHelpersTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHPathHelpersTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/OHPathHelpersTests.m diff --git a/Tests/OHHTTPStubsTests/TimingTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/TimingTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/TimingTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/TimingTests.m diff --git a/Tests/OHHTTPStubsTests/WithContentsOfURLTests.m b/Tests/OHHTTPStubsTests/OHHTTPStubsTests/WithContentsOfURLTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/WithContentsOfURLTests.m rename to Tests/OHHTTPStubsTests/OHHTTPStubsTests/WithContentsOfURLTests.m From c65be0d2721adcca95bfea61ee4a41f9d27ebf51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corut=CC=A6=20Fabrizio?= Date: Tue, 26 Jan 2021 10:55:52 +0200 Subject: [PATCH 5/5] Revert mocktail tests support. --- OHHTTPStubs.xcodeproj/project.pbxproj | 26 +++++++------------ .../MocktailTests/MocktailTests.m | 0 .../AFNetworkingTests.m | 0 .../NSURLConnectionDelegateTests.m | 0 .../NSURLConnectionTests.m | 0 .../NSURLSessionTests.m | 0 .../{OHHTTPStubsTests => }/NilValuesTests.m | 0 .../OHPathHelpersTests.m | 0 .../{OHHTTPStubsTests => }/TimingTests.m | 0 .../WithContentsOfURLTests.m | 0 10 files changed, 9 insertions(+), 17 deletions(-) rename Tests/{OHHTTPStubsTests => }/MocktailTests/MocktailTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/AFNetworkingTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/NSURLConnectionDelegateTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/NSURLConnectionTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/NSURLSessionTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/NilValuesTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/OHPathHelpersTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/TimingTests.m (100%) rename Tests/OHHTTPStubsTests/{OHHTTPStubsTests => }/WithContentsOfURLTests.m (100%) diff --git a/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs.xcodeproj/project.pbxproj index 3064acde..379ddf59 100644 --- a/OHHTTPStubs.xcodeproj/project.pbxproj +++ b/OHHTTPStubs.xcodeproj/project.pbxproj @@ -380,21 +380,6 @@ path = OHHTTPStubs; sourceTree = ""; }; - 05F728E625BF83A600549B1D /* OHHTTPStubsTests */ = { - isa = PBXGroup; - children = ( - 1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */, - 1FB9F02B22FFC0CF0027737A /* NSURLSessionTests.m */, - 1FB9F02C22FFC0CF0027737A /* TimingTests.m */, - 1FB9F02D22FFC0CF0027737A /* OHPathHelpersTests.m */, - 1FB9F02E22FFC0CF0027737A /* AFNetworkingTests.m */, - 1FB9F02F22FFC0CF0027737A /* WithContentsOfURLTests.m */, - 1FB9F03022FFC0CF0027737A /* NSURLConnectionDelegateTests.m */, - 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */, - ); - path = OHHTTPStubsTests; - sourceTree = ""; - }; 09110A3819805F4800D175E4 = { isa = PBXGroup; children = ( @@ -497,8 +482,14 @@ 1FB9F02922FFC0CF0027737A /* OHHTTPStubsTests */ = { isa = PBXGroup; children = ( - 1FCC5CED22FD95D700472F5B /* MocktailTests */, - 05F728E625BF83A600549B1D /* OHHTTPStubsTests */, + 1FB9F02A22FFC0CF0027737A /* NSURLConnectionTests.m */, + 1FB9F02B22FFC0CF0027737A /* NSURLSessionTests.m */, + 1FB9F02C22FFC0CF0027737A /* TimingTests.m */, + 1FB9F02D22FFC0CF0027737A /* OHPathHelpersTests.m */, + 1FB9F02E22FFC0CF0027737A /* AFNetworkingTests.m */, + 1FB9F02F22FFC0CF0027737A /* WithContentsOfURLTests.m */, + 1FB9F03022FFC0CF0027737A /* NSURLConnectionDelegateTests.m */, + 1FB9F03122FFC0CF0027737A /* NilValuesTests.m */, ); path = OHHTTPStubsTests; sourceTree = ""; @@ -535,6 +526,7 @@ isa = PBXGroup; children = ( 1FCC5CE222FD95D700472F5B /* Fixtures */, + 1FCC5CED22FD95D700472F5B /* MocktailTests */, 1FB9F02922FFC0CF0027737A /* OHHTTPStubsTests */, 1F51F12222FE4C53003463C1 /* OHHTTPStubsSwiftTests */, 1F462BBD22FD9765000B7253 /* Supporting Files */, diff --git a/Tests/OHHTTPStubsTests/MocktailTests/MocktailTests.m b/Tests/MocktailTests/MocktailTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/MocktailTests/MocktailTests.m rename to Tests/MocktailTests/MocktailTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/AFNetworkingTests.m b/Tests/OHHTTPStubsTests/AFNetworkingTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/AFNetworkingTests.m rename to Tests/OHHTTPStubsTests/AFNetworkingTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m b/Tests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m rename to Tests/OHHTTPStubsTests/NSURLConnectionDelegateTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionTests.m b/Tests/OHHTTPStubsTests/NSURLConnectionTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLConnectionTests.m rename to Tests/OHHTTPStubsTests/NSURLConnectionTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLSessionTests.m b/Tests/OHHTTPStubsTests/NSURLSessionTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/NSURLSessionTests.m rename to Tests/OHHTTPStubsTests/NSURLSessionTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/NilValuesTests.m b/Tests/OHHTTPStubsTests/NilValuesTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/NilValuesTests.m rename to Tests/OHHTTPStubsTests/NilValuesTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/OHPathHelpersTests.m b/Tests/OHHTTPStubsTests/OHPathHelpersTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/OHPathHelpersTests.m rename to Tests/OHHTTPStubsTests/OHPathHelpersTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/TimingTests.m b/Tests/OHHTTPStubsTests/TimingTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/TimingTests.m rename to Tests/OHHTTPStubsTests/TimingTests.m diff --git a/Tests/OHHTTPStubsTests/OHHTTPStubsTests/WithContentsOfURLTests.m b/Tests/OHHTTPStubsTests/WithContentsOfURLTests.m similarity index 100% rename from Tests/OHHTTPStubsTests/OHHTTPStubsTests/WithContentsOfURLTests.m rename to Tests/OHHTTPStubsTests/WithContentsOfURLTests.m