netguru · Siemian · Dec 21, 2021 · Jun 18, 2021 · Jun 18, 2021 · Oct 30, 2021
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,5 @@ DerivedData
 
 Pods
 Carthage
+.build
+.swiftpm
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,52 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "CwlCatchException",
+        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
+        "state": {
+          "branch": null,
+          "revision": "682841464136f8c66e04afe5dbd01ab51a3a56f2",
+          "version": "2.1.0"
+        }
+      },
+      {
+        "package": "CwlPreconditionTesting",
+        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+        "state": {
+          "branch": null,
+          "revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
+          "version": "2.0.0"
+        }
+      },
+      {
+        "package": "Nimble",
+        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "state": {
+          "branch": null,
+          "revision": "e491a6731307bb23783bf664d003be9b2fa59ab5",
+          "version": "9.0.0"
+        }
+      },
+      {
+        "package": "OHHTTPStubs",
+        "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs.git",
+        "state": {
+          "branch": null,
+          "revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9",
+          "version": "9.1.0"
+        }
+      },
+      {
+        "package": "Quick",
+        "repositoryURL": "https://github.com/Quick/Quick.git",
+        "state": {
+          "branch": null,
+          "revision": "0038bcbab4292f3b028632556507c124e5ba69f3",
+          "version": "3.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,121 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "ResponseDetective",
+    platforms: [
+        .iOS(.v8),
+        .macOS(.v10_10),
+        .tvOS(.v9)
+    ],
+    products: [
+        .library(
+            name: "ResponseDetective",
+            targets: [
+                "ResponseDetective",
+                "ResponseDetectiveObjC"
+            ]
+        )
+    ],
+    dependencies: [
+        .package(
+            url: "https://github.com/Quick/Quick.git",
+            .exact("3.0.0")
+        ),
+        .package(
+            url: "https://github.com/Quick/Nimble.git",
+            .exact("9.0.0")
+        ),
+        .package(
+            url: "https://github.com/AliSoftware/OHHTTPStubs.git",
+            .exact("9.1.0")
+        )
+    ],
+    targets: [
+        .target(
+            name: "ResponseDetective",
+            dependencies: ["ResponseDetectiveObjC"],
+            path: "ResponseDetective",
+            exclude: [
+                "Configuration",
+                "Resources",
+                "Tests",
+                "include",
+                "Sources/RDTHTMLBodyDeserializer.h",
+                "Sources/RDTXMLBodyDeserializer.h",
+                "Sources/ResponseDetective.h",
+                "Sources/RDTHTMLBodyDeserializer.m",
+                "Sources/RDTBodyDeserializer.h",
+                "Sources/RDTXMLBodyDeserializer.m"
+            ],
+            sources: [
+                "Sources/ResponseRepresentation.swift",
+                "Sources/ErrorRepresentation.swift",
+                "Sources/ResponseDetective.swift",
+                "Sources/BufferOutputFacility.swift",
+                "Sources/ConsoleOutputFacility.swift",
+                "Sources/URLEncodedBodyDeserializer.swift",
+                "Sources/PlaintextBodyDeserializer.swift",
+                "Sources/ImageBodyDeserializer.swift",
+                "Sources/JSONBodyDeserializer.swift",
+                "Sources/Dictionary.swift",
+                "Sources/URLProtocol.swift",
+                "Sources/OutputFacility.swift",
+                "Sources/RequestRepresentation.swift"
+            ]
+        ),
+        .target(
+            name: "ResponseDetectiveObjC",
+            dependencies: [],
+            path: "ResponseDetective",
+            exclude: [
+                "Configuration",
+                "Resources",
+                "Tests",
+                "Sources/ResponseRepresentation.swift",
+                "Sources/ErrorRepresentation.swift",
+                "Sources/ResponseDetective.swift",
+                "Sources/BufferOutputFacility.swift",
+                "Sources/ConsoleOutputFacility.swift",
+                "Sources/URLEncodedBodyDeserializer.swift",
+                "Sources/PlaintextBodyDeserializer.swift",
+                "Sources/ImageBodyDeserializer.swift",
+                "Sources/JSONBodyDeserializer.swift",
+                "Sources/Dictionary.swift",
+                "Sources/URLProtocol.swift",
+                "Sources/OutputFacility.swift",
+                "Sources/RequestRepresentation.swift"
+            ],
+            sources: [
+                "Sources/RDTHTMLBodyDeserializer.h",
+                "Sources/RDTXMLBodyDeserializer.h",
+                "Sources/ResponseDetective.h",
+                "Sources/RDTHTMLBodyDeserializer.m",
+                "Sources/RDTBodyDeserializer.h",
+                "Sources/RDTXMLBodyDeserializer.m"
+            ],
+            cSettings: [
+                .headerSearchPath("ResponseDetective/Sources"),
+                .headerSearchPath("ResponseDetective")
+            ]
+        ),
+        .testTarget(
+            name: "ResponseDetectiveTests",
+            dependencies: [
+                "ResponseDetective",
+                "ResponseDetectiveObjC",
+                "Quick",
+                "Nimble",
+                "OHHTTPStubs"
+            ],
+            path: "ResponseDetective",
+            exclude: [
+                "Configuration",
+                "Resources",
+                "Sources",
+                "include",
+            ],
+            sources: ["Tests"]
+        ),
+    ]
+)
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 ![](https://img.shields.io/github/release/netguru/ResponseDetective.svg)
 ![](https://img.shields.io/badge/carthage-compatible-green.svg)
 ![](https://img.shields.io/badge/cocoapods-compatible-green.svg)
+![](https://img.shields.io/badge/spm-compatible-green.svg)
 ![](https://img.shields.io/badge/license-MIT-blue.svg)
 
 **ResponseDetective** is a non-intrusive framework for intercepting any outgoing requests and incoming responses between your app and your server for debugging purposes.
@@ -129,6 +130,10 @@ use_frameworks!
 pod 'ResponseDetective', '~> {version}'
 ```
 
+### Swift Package Manager
+
+If you're using [Swift Package Manager](https://github.com/apple/swift-package-manager), add this repository to the Swift Packages in your project settings.
+
 ### Local
 
 To install the test dependencies or to build ResponseDetective itself, do not run `carthage` directly. It can't handle the Apple Silicon architectures introduced in Xcode 12. Instead, run it through the `carthage.sh` script:
@@ -137,6 +142,12 @@ To install the test dependencies or to build ResponseDetective itself, do not ru
 $ ./carthage.sh bootstrap
 ```
 
+Alternatively, you can run the tests locally using Swift Package Manager with the following command:
+
+```bash
+$ swift test
+```
+
 ## About
 
 This project was made with ♡ by [Netguru](https://netguru.com).

diff --git a/ResponseDetective/Sources/ImageBodyDeserializer.swift b/ResponseDetective/Sources/ImageBodyDeserializer.swift
@@ -10,6 +10,9 @@
 #elseif os(OSX)
 	import AppKit
 #endif
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 
 /// Deserializes image bodies.
 @objc(RDTImageBodyDeserializer) public final class ImageBodyDeserializer: NSObject, BodyDeserializer {

diff --git a/ResponseDetective/Sources/JSONBodyDeserializer.swift b/ResponseDetective/Sources/JSONBodyDeserializer.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 
 /// Deserializes JSON bodies.
 @objc(RDTJSONBodyDeserializer) public final class JSONBodyDeserializer: NSObject, BodyDeserializer {

diff --git a/ResponseDetective/Sources/PlaintextBodyDeserializer.swift b/ResponseDetective/Sources/PlaintextBodyDeserializer.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 
 /// Deserializes plaintext bodies.
 @objc(RDTPlaintextBodyDeserializer) public final class PlaintextBodyDeserializer: NSObject, BodyDeserializer {

diff --git a/ResponseDetective/Sources/ResponseDetective.h b/ResponseDetective/Sources/ResponseDetective.h
@@ -13,6 +13,6 @@ extern const unsigned char ResponseDetectiveVersionString[];
 
 @import Foundation;
 
-#import <ResponseDetective/RDTBodyDeserializer.h>
-#import <ResponseDetective/RDTXMLBodyDeserializer.h>
-#import <ResponseDetective/RDTHTMLBodyDeserializer.h>
+#import "RDTBodyDeserializer.h"
+#import "RDTXMLBodyDeserializer.h"
+#import "RDTHTMLBodyDeserializer.h"
diff --git a/ResponseDetective/Sources/ResponseDetective.swift b/ResponseDetective/Sources/ResponseDetective.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 
 /// ResponseDetective configuration cluster class that defines the behavior
 /// of request interception and logging.

diff --git a/ResponseDetective/Sources/URLEncodedBodyDeserializer.swift b/ResponseDetective/Sources/URLEncodedBodyDeserializer.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 
 /// Deserializes URL-encoded bodies.
 @objc(RDTURLEncodedBodyDeserializer) public final class URLEncodedBodyDeserializer: NSObject, BodyDeserializer {

diff --git a/ResponseDetective/Tests/Additions/TestBodyDeserializer.swift b/ResponseDetective/Tests/Additions/TestBodyDeserializer.swift
@@ -6,6 +6,9 @@
 //
 
 import ResponseDetective
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 
 /// A test body deserializer.
 internal final class TestBodyDeserializer: NSObject, BodyDeserializer {

diff --git a/ResponseDetective/Tests/Specs/HTMLBodyDeserializerSpec.swift b/ResponseDetective/Tests/Specs/HTMLBodyDeserializerSpec.swift
@@ -8,6 +8,9 @@
 import Foundation
 import Nimble
 import ResponseDetective
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 import Quick
 
 internal final class HTMLBodyDeserializerSpec: QuickSpec {

diff --git a/ResponseDetective/Tests/Specs/ResponseDetectiveSpec.swift b/ResponseDetective/Tests/Specs/ResponseDetectiveSpec.swift
@@ -18,7 +18,9 @@ internal final class ResponseDetectiveSpec: QuickSpec {
 		describe("ResponseDetective") {
 
 			beforeSuite {
-				stub(condition: isHost("httpbin.org")) { _ in
+				HTTPStubs.stubRequests { request in
+					return request.url?.host == "httpbin.org"
+				} withStubResponse: { _ in
 					return HTTPStubsResponse(data: Data(), statusCode: 200, headers: nil)
 				}
 			}
@@ -150,10 +152,11 @@ internal final class ResponseDetectiveSpec: QuickSpec {
 
 			describe("request interception") {
 
-				let buffer = BufferOutputFacility()
+				var buffer: BufferOutputFacility!
 				let configuration = URLSessionConfiguration.default
 
 				beforeEach {
+					buffer = BufferOutputFacility()
 					ResponseDetective.outputFacility = buffer
 					ResponseDetective.registerBodyDeserializer(TestBodyDeserializer(), forContentType: "*/*")
 					ResponseDetective.enable(inConfiguration: configuration)
@@ -192,10 +195,11 @@ internal final class ResponseDetectiveSpec: QuickSpec {
 
 			describe("response interception") {
 
-				let buffer = BufferOutputFacility()
+				var buffer: BufferOutputFacility!
 				let configuration = URLSessionConfiguration.default
 
 				beforeEach {
+					buffer = BufferOutputFacility()
 					ResponseDetective.outputFacility = buffer
 					ResponseDetective.registerBodyDeserializer(TestBodyDeserializer(), forContentType: "*/*")
 					ResponseDetective.enable(inConfiguration: configuration)
@@ -228,10 +232,11 @@ internal final class ResponseDetectiveSpec: QuickSpec {
 
 			describe("error interception") {
 
-				let buffer = BufferOutputFacility()
+				var buffer: BufferOutputFacility!
 				let configuration = URLSessionConfiguration.default
 
 				beforeEach {
+					buffer = BufferOutputFacility()
 					ResponseDetective.outputFacility = buffer
 					ResponseDetective.registerBodyDeserializer(TestBodyDeserializer(), forContentType: "*/*")
 					ResponseDetective.enable(inConfiguration: configuration)

diff --git a/ResponseDetective/Tests/Specs/XMLBodyDeserializerSpec.swift b/ResponseDetective/Tests/Specs/XMLBodyDeserializerSpec.swift
@@ -8,6 +8,9 @@
 import Foundation
 import Nimble
 import ResponseDetective
+#if SWIFT_PACKAGE
+import ResponseDetectiveObjC
+#endif
 import Quick
 
 internal final class XMLBodyDeserializerSpec: QuickSpec {

diff --git a/ResponseDetective/include/RDTBodyDeserializer.h b/ResponseDetective/include/RDTBodyDeserializer.h
@@ -0,0 +1 @@
+../Sources/RDTBodyDeserializer.h
diff --git a/ResponseDetective/include/RDTHTMLBodyDeserializer.h b/ResponseDetective/include/RDTHTMLBodyDeserializer.h
@@ -0,0 +1 @@
+../Sources/RDTHTMLBodyDeserializer.h
diff --git a/ResponseDetective/include/RDTXMLBodyDeserializer.h b/ResponseDetective/include/RDTXMLBodyDeserializer.h
@@ -0,0 +1 @@
+../Sources/RDTXMLBodyDeserializer.h
diff --git a/ResponseDetective/include/ResponseDetective.h b/ResponseDetective/include/ResponseDetective.h
@@ -0,0 +1 @@
+../Sources/ResponseDetective.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,3 +34,5 @@ DerivedData @@
     Pods
     Carthage
+    .build
+    .swiftpm