Merge branch 'release/1.3.0'

Author: akashivskyy

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/netguru/xcconfigs.git
+[submodule "Carthage/Checkouts/OHHTTPStubs"]
+	path = Carthage/Checkouts/OHHTTPStubs
+	url = https://github.com/AliSoftware/OHHTTPStubs.git

.swift-version

@@ -11,6 +11,6 @@ github "netguru/xcconfigs" == 0.3
 
 # Test dependencies
 
-github "Quick/Quick" ~> 1.2.0
-github "Quick/Nimble" ~> 7.0.0
-github "AliSoftware/OHHTTPStubs" ~> 6.1.0
+github "Quick/Quick" ~> 2.0.0
+github "Quick/Nimble" ~> 8.0.0
+github "AliSoftware/OHHTTPStubs" ~> 7.0.0

Cartfile.private

@@ -1,4 +1,4 @@
-github "AliSoftware/OHHTTPStubs" "6.1.0"
-github "Quick/Nimble" "v7.0.3"
-github "Quick/Quick" "v1.2.0"
+github "AliSoftware/OHHTTPStubs" "7.0.0"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.0.0"
 github "netguru/xcconfigs" "0.3"

Cartfile.resolved

@@ -1,4 +1,4 @@
-**MIT License**
+MIT License
 
 Copyright © 2017 Netguru Sp. z o.o.
 

Carthage/Checkouts/Nimble

@@ -1,16 +1,17 @@
 ![](Images/Header.png)
 
-![](https://www.bitrise.io/app/c09426001dedd91c.svg?token=4zhZMFtDpH-9BhWvGP5-1g&branch=develop)
-![](https://img.shields.io/badge/swift-3.2-orange.svg)
+![](https://app.bitrise.io/app/c09426001dedd91c/status.svg?token=4zhZMFtDpH-9BhWvGP5-1g&branch=develop)
+![](https://img.shields.io/badge/swift-5.0-orange.svg)
 ![](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/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.
 
 ## Requirements
 
-ResponseDetective is written in **Swift 3.2** and supports **iOS 8.0+**, **macOS 10.9+** and **tvOS 9.0+**.
+ResponseDetective is written in **Swift 5.0** and supports **iOS 8.0+**, **macOS 10.10+** and **tvOS 9.0+**.
 
 ## Usage
 
@@ -117,7 +118,7 @@ Voilà! 🎉 Check out your console output:
 If you're using [Carthage](https://github.com/Carthage/Carthage), add the following dependency to your `Cartfile`:
 
 ```none
-github "netguru/ResponseDetective"
+github "netguru/ResponseDetective" ~> {version}
 ```
 
 ### CocoaPods
@@ -126,7 +127,7 @@ If you're using [CocoaPods](http://cocoapods.org), add the following dependency
 
 ```none
 use_frameworks!
-pod 'ResponseDetective'
+pod 'ResponseDetective', '~> {version}'
 ```
 
 ## About

Carthage/Checkouts/OHHTTPStubs

@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
   # Description
 
   spec.name = 'ResponseDetective'
-  spec.version = '1.2.4'
+  spec.version = '1.3.0'
   spec.summary = 'Sherlock Holmes of the networking layer'
   spec.homepage = 'https://github.com/netguru/ResponseDetective'
 
@@ -46,10 +46,12 @@ Pod::Spec.new do |spec|
 
   # Settings
 
+  spec.swift_version = '5.0'
+
   spec.requires_arc = true
 
   spec.ios.deployment_target = '8.0'
-  spec.osx.deployment_target = '10.9'
+  spec.osx.deployment_target = '10.10'
   spec.tvos.deployment_target = '9.0'
 
   spec.pod_target_xcconfig = {

Carthage/Checkouts/Quick

@@ -141,7 +141,6 @@
 		3A7A4A831EC71336005E2E9D /* Common-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Common-Base.xcconfig"; sourceTree = "<group>"; };
 		3A7A4A841EC71410005E2E9D /* Framework-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Framework-Base.xcconfig"; sourceTree = "<group>"; };
 		3AB9E97E1EBB64C0004E575E /* URLEncodedBodyDeserializerSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedBodyDeserializerSpec.swift; sourceTree = "<group>"; };
-		3ABF34631E8B2A9E0010A8FE /* .swift-version */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".swift-version"; sourceTree = "<group>"; };
 		3AC631201EBB5CF8000F6353 /* URLEncodedBodyDeserializer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLEncodedBodyDeserializer.swift; sourceTree = "<group>"; };
 		3AE5462A1E152DB500E74469 /* ResponseDetective.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ResponseDetective.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AE546321E152DB600E74469 /* ResponseDetectiveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ResponseDetectiveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -244,7 +243,6 @@
 		3A5A99CA1E60404E002EFC39 /* Other Files */ = {
 			isa = PBXGroup;
 			children = (
-				3ABF34631E8B2A9E0010A8FE /* .swift-version */,
 				3A5A99CB1E604064002EFC39 /* bitrise.yml */,
 				3A5A99CC1E604064002EFC39 /* Cartfile.private */,
 				3A5A99CD1E604064002EFC39 /* ResponseDetective.podspec */,
@@ -635,7 +633,7 @@
 				CLASSPREFIX = RDT;
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Netguru Sp. z o.o.";
 				TargetAttributes = {
 					3A2007D71B5501BC00769021 = {
@@ -666,10 +664,11 @@
 			};
 			buildConfigurationList = 3AED3EC61B1DD7B400FA35FC /* Build configuration list for PBXProject "ResponseDetective" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 3AED3EC21B1DD7B400FA35FC;
 			productRefGroup = 3AED3ECD1B1DD7B400FA35FC /* Products */;

LICENSE.md

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ResponseDetective.podspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ResponseDetective.xcodeproj/project.pbxproj

@@ -12,14 +12,14 @@
 
 // MARK: Build
 
-_BUILD_VERSION = 1.2.4
+_BUILD_VERSION = 1.3.0
 
 // MARK: Deployment
 
 _DEPLOYMENT_TARGET_IOS = 8.0
-_DEPLOYMENT_TARGET_MACOS = 10.9
+_DEPLOYMENT_TARGET_MACOS = 10.10
 _DEPLOYMENT_TARGET_TVOS = 9.0
 
 // MARK: Compiler
 
-_COMPILER_SWIFT_VERSION = 3.2
+_COMPILER_SWIFT_VERSION = 5.0

ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-iOS.xcscheme

@@ -5,7 +5,7 @@
 // Licensed under the MIT License.
 //
 
-internal extension Dictionary {
+extension Dictionary {
 
 	/// Appends elements of other `dictionary` and returns a new one.
 	///

ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-macOS.xcscheme

@@ -43,7 +43,7 @@ import Foundation
 			domain: error.domain,
 			code: error.code,
 			reason: error.localizedDescription,
-			userInfo: error.userInfo as? [String: AnyObject] ?? [:]
+			userInfo: error.userInfo
 		)
 	}
 

ResponseDetective.xcodeproj/xcshareddata/xcschemes/ResponseDetective-tvOS.xcscheme

@@ -63,8 +63,8 @@ private func swatchImage(size: (width: Int, height: Int)) -> Image {
 
 private func imageData(image: Image) -> Data {
 	#if os(iOS) || os(tvOS) || os(watchOS)
-		return UIImageJPEGRepresentation(image, 1)!
+        return image.jpegData(compressionQuality: 1)!
 	#elseif os(OSX)
-		return NSBitmapImageRep(data: image.tiffRepresentation!)!.representation(using: .JPEG, properties: [NSImageCompressionFactor: 1])!
+        return NSBitmapImageRep(data: image.tiffRepresentation!)!.representation(using: .jpeg, properties: [.compressionFactor: 1])!
 	#endif
 }

ResponseDetective/Configuration/Common-Base.xcconfig

@@ -50,7 +50,7 @@ internal final class URLEncodedBodyDeserializerSpec: QuickSpec {
 
 // MARK: -
 
-@available(macOS 10.10, *) fileprivate extension URLComponents {
+@available(macOS 10.10, *) extension URLComponents {
 
 	fileprivate init(queryItems: [URLQueryItem]) {
 		self.init()