DiUS · nonec · Jan 4, 2018 · Jan 4, 2018 · Jan 5, 2018 · Feb 7, 2018
diff --git a/.ruby-version b/.ruby-version
diff --git a/.swift-version b/.swift-version
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode11.2
+cache:
+  directories:
+    - Carthage
 env:
   global:
     - IOS_FRAMEWORK_SCHEME="PactConsumerSwift iOS"
@@ -8,21 +11,20 @@ env:
     - secure: QmmEqePFeG6D1Qu0KrWI0w6LiwiY3V2qUWAHxQrSYFFPG4wJOZuHpwdk9NO45gOzPYxbkzXT9MynWFMs5pZKrIJCmQRkK5fNcDecwvNunsJEzBmvNYLhd0B4IKy2R1pBmKcDHPIYCzgpanPDAV7LhTXlGoUGk59+QL6qK8+hBQs=
     - secure: FpfacekFs93LkX9gerQUxQKIDTjBl2abp7ZQ/8L3DiJo4nMF7xEwUGeSDQMR+2hRqRWr/SdU59Lll5k10JBqWxAaLXDTUq3Lh3aamc4nc2PAN7yp+0aq9RQG5+PaLkfx+SLs5B/CjDiRRotZg/H/uMTRRFbkqydVtxiqGv94JOg=
   matrix:
-    - DESTINATION="OS=11.2,name=iPhone 8"          SCHEME="$IOS_FRAMEWORK_SCHEME"     CARTHAGE_PLATFORM="iOS"
-    - DESTINATION="OS=10.3.1,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     CARTHAGE_PLATFORM="iOS"
-    - DESTINATION="OS=11.2,name=Apple TV"          SCHEME="$TVOS_FRAMEWORK_SCHEME"    CARTHAGE_PLATFORM="tvOS"
-    - DESTINATION="arch=x86_64"                    SCHEME="$MACOS_FRAMEWORK_SCHEME"   CARTHAGE_PLATFORM="macOS"
+    - DESTINATION="OS=11.0,name=Apple TV 4K (at 1080p)" SCHEME="$TVOS_FRAMEWORK_SCHEME" CARTHAGE_PLATFORM="tvOS"
+    - DESTINATION="arch=x86_64"             SCHEME="$MACOS_FRAMEWORK_SCHEME"     CARTHAGE_PLATFORM="macOS"
+    - DESTINATION="OS=12.0,name=iPhone X"   SCHEME="$IOS_FRAMEWORK_SCHEME"       CARTHAGE_PLATFORM="iOS"
+    - DESTINATION="OS=11.3,name=iPhone 8"   SCHEME="$IOS_FRAMEWORK_SCHEME"       CARTHAGE_PLATFORM="iOS"
 before_install:
-  - scripts/import_keychain.sh
-  - security find-identity -v -p codesigning
-  - bundle install
+  - gem install xcpretty
+  - brew update && brew bundle
   - brew outdated carthage || brew upgrade carthage
-  - brew outdated swiftlint || brew upgrade swiftlint
-  - carthage checkout
+  - carthage bootstrap
 script:
   - set -o pipefail
   - scripts/build.sh
-  - bash <(curl -s https://codecov.io/bash) -J 'PactConsumerSwift'
-after_script: scripts/delete_keychain.sh
+after_failure:
+  - tail -n25 $TMPDIR/carthage-*.log
 after_success:
+  - bash <(curl -s https://codecov.io/bash) -J 'PactConsumerSwift'
   - scripts/build_children.sh
diff --git a/Brewfile b/Brewfile
@@ -0,0 +1,4 @@
+tap 'pact-foundation/pact-ruby-standalone'
+brew 'carthage'
+brew 'swiftlint'
+brew 'pact-ruby-standalone'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,74 @@
+# 0.7.1 - Bugfix Release
 
 
+* 01effee - style: add convenience init method to MockService which defaults error reporting but allows configuration of the verifier. (#77) (alan.nichols@outlook.com, Tue Nov 12 22:22:16 2019 +0000)
+* f5e34d5 - chore: Change minimum swift version to 4.2 due Nimble requirements. Also fix cocoapods configuration. (Andrew Spinks, Sat Aug 31 14:55:31 2019 +0900)
+* c91360d - Revert "chore: Bumping version to 0.6.2" due to cocoapods issues. (Andrew Spinks, Sat Aug 31 14:50:40 2019 +0900)
+* 58775a2 - chore: Bumping version to 0.6.2 (Andrew Spinks, Sat Aug 31 14:11:12 2019 +0900)
+* 8f2c76b - fix: Bump dependencies to support swift 5. Also removes obsolete references to Result.framework. (Marko Justinek, Tue Aug 27 00:50:46 2019 +0200)
+* 5b1e1bf - chore: convert release script to be a bash script #46 (Andrew Spinks, Sun Jul 28 10:32:30 2019 +0900)
+# 0.7.0 - Bugfix Release
+
+
+* 16bbf44 - chore: Change minimum swift version to 4.2 due Nimble requirements. Also fix cocoapods configuration. (Andrew Spinks, Sat Aug 31 14:55:31 2019 +0900)
+* c91360d - Revert "chore: Bumping version to 0.6.2" due to cocoapods issues. (Andrew Spinks, Sat Aug 31 14:50:40 2019 +0900)
+* 58775a2 - chore: Bumping version to 0.6.2 (Andrew Spinks, Sat Aug 31 14:11:12 2019 +0900)
+* 8f2c76b - fix: Bump dependencies to support swift 5. Also removes obsolete references to Result.framework. (Marko Justinek, Tue Aug 27 00:50:46 2019 +0200)
+* 5b1e1bf - chore: convert release script to be a bash script #46 (Andrew Spinks, Sun Jul 28 10:32:30 2019 +0900)
+-en # 0.6.1 - Bugfix Release
+
+
+* 57ccbd6 - fix(objc): add escaping modifier to allow for testComplete function to be called… (#71) (Matt Arturi, Sat Jul 27 09:43:09 2019 -0400)
+* a611dce - chore: Only run coverage report when tests pass (Andrew Spinks, Sat Jul 27 20:48:05 2019 +0900)
+* cacde03 - chore: Fix test failures not failing travis build. (Andrew Spinks, Sat Jul 27 20:47:52 2019 +0900)
+* cc66ee5 - test: Add test around pact mock service to make refactors easier. (Andrew Spinks, Wed Jul 3 19:29:27 2019 +0900)
+* 31fdfc7 - fix: Revert "Refactor pact mock server network calling code and upgrade to swift 5 (#53)" which introduced a bug where messages from the mock server were no longer being returned. (Andrew Spinks, Thu Jul 18 17:35:45 2019 +0900)
+* 8a42f89 - fix(lint): Parameter alignment (Marko Justinek, Tue Jul 2 06:29:45 2019 +1000)
+* 217b5e2 - chore(lint): moved linting into a portable script (#66) (Marko Justinek, Mon Jul 1 21:00:51 2019 +1000)
+* aa25c8f - Cleanup access controls on classes to hide internal concepts. (Andrew Spinks, Sat Jun 29 16:50:33 2019 +0900)
+* 1665942 - Remove unused .ruby-version file (#65) (Marko Justinek, Fri Jun 28 17:32:07 2019 +1000)
+* feaa5d5 - Removes watchOS target and scheme (#64) (Marko Justinek, Fri Jun 28 17:30:39 2019 +1000)
+
+
+# 0.6.0 - Maintenance Release
+
+* 9605227 - Cleanup build settings so ci build can be more easily reproduced locally. (#59) (andrewspinks, Tue Jun 25 17:32:54 2019 +0900)
+* cdecfbc - Fixes bitcode related issue when used from CocoaPods. (Kyle Hammond, Mon Jun 24 10:36:16 2019 -0500)
+* 848f4c5 - Remove quick dependency from requirements. It is only used for internal tests. (#58) (andrewspinks, Sun Jun 23 11:19:26 2019 +0900)
+* 8688fdc - Refactor pact mock server network calling code and upgrade to swift 5 (#53) (Marko Justinek, Wed Jun 19 17:32:45 2019 +1000)
+* 23296ce - Completely removed Alamofire in favor of simple networking calls. (#51) (Kyle Hammond, Wed Jun 12 18:53:11 2019 -0500)
+* 3ed97f1 - Update dependencies (Mihai Georgescu, Mon Mar 25 23:12:14 2019 +0000)
+* 28e1588 - Fix cocoa pods release version number and release script. (Andrew Spinks, Thu Jan 24 20:17:51 2019 +0900)
+
+# 0.5.3 - Bugfix Release
+
+* a1cd000 - Update cocoapods dependencies. (Andrew Spinks, Thu Jan 24 19:34:14 2019 +0900)
+* 5ebc062 - Update pact-mock-service versions (Andrew Spinks, Thu Jan 24 17:29:40 2019 +0900)
+* 2e77868 - Update Cartfile.resolved for use with bootstrap on CI (Marko Justinek, Thu Jan 24 09:06:45 2019 +1100)
+* f8899f8 - Update Quick dependency to use “master” (Marko Justinek, Thu Jan 24 08:38:31 2019 +1100)
+* 596b6b8 - Update travis CI env matrix (Marko Justinek, Thu Jan 24 08:26:12 2019 +1100)
+* 8c4d3cf - Bumps up versions of all dependencies (Marko Justinek, Wed Jan 23 23:58:20 2019 +1100)
+* 4198e38 - Bump up Alamofire version (Marko Justinek, Wed Jan 23 23:47:04 2019 +1100)
+* 5897e28 - Updates travis pipeline to run tests on iOS 12.1 and 11.3 (Marko Justinek, Wed Jan 23 23:30:14 2019 +1100)
+* 0e7212b - Project updates for Swift 4.2 (Marko Justinek, Wed Jan 23 23:21:23 2019 +1100)
+* 6ca5c37 - Update BrightFutures dependency version (Marko Justinek, Wed Jan 23 23:12:39 2019 +1100)
+* d639fe7 - Update readme (Marko Justinek, Wed Jan 23 23:12:23 2019 +1100)
+* e1c4596 - Removed reference to non-standalone pact mock service (Marko Justinek, Fri May 18 11:00:12 2018 +1000)
+* 2a667c2 - Updates README to encourage usage of pact-ruby-standalone (Marko Justinek, Thu May 17 08:27:07 2018 +1000)
+* 5ec6eb3 - bump cocoapods version to 0.5.2 (Andrew Spinks, Tue May 8 17:22:01 2018 +0900)
+
+# 0.5.2 - Bugfix Release
+
+* 52cf980 - Update release script to work better with cocoa pods (Andrew Spinks, Tue May 8 17:09:25 2018 +0900)
+* 2bc59b5 - Update gems (Andrew Spinks, Tue May 8 16:26:54 2018 +0900)
+* 6749fdc - Merge pull request #38 from stitchfix/master (andrewspinks, Tue May 1 11:46:08 2018 +0900)
+* 26cab90 - Update BrightFutures (Robbin Voortman, Wed Apr 25 08:51:25 2018 +0200)
+* b538409 - wait on verify to complete before allowing tests to continue to prevent race condition (Eric Vennaro, Tue Apr 24 15:31:03 2018 -0700)
+* 3e1edc3 - move to brew update (Stephen, Thu Jan 4 16:42:57 2018 -0800)
+* db7abe5 - move to brew bundle (Stephen, Thu Jan 4 15:37:59 2018 -0800)
+* 8bc8fc0 - Create Brewfile (Stephen, Thu Jan 4 15:37:26 2018 -0800)
+* 9c5678b - Update cocopods version number (Andrew Spinks, Thu Oct 26 19:19:37 2017 +0900)
+
 # 0.5.1 - Bugfix Release
 
 * 1b6ba70 - Fixed issue preventing the pact writing (Angel G. Olloqui, Wed Oct 25 12:30:38 2017 +0200)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,12 @@
 # Contributing to Pact Consumer Swift project
 
 ### Prepare your development environment
-The Pact Consumer Swift library is using Carthage and Swift Package Manager to manage library dependencies. You should install [Carthage](https://github.com/Carthage/Carthage) using [Homebrew](https://brew.sh), then download and build the dependencies using `carthage bootstrap` (Carthage), or `swift package resolve` (SwiftPM).
+The Pact Consumer Swift library is using Carthage and Swift Package Manager to manage library dependencies. You should install [Carthage](https://github.com/Carthage/Carthage) using [Homebrew](https://brew.sh), then download and build the dependencies using `carthage bootstrap` (Carthage).
+
+Required build dependencies can be installed by running:
+```
+./scripts/install_deps.sh
+```
 
 ### Running tests with default destination
 ```
@@ -10,12 +15,12 @@ The Pact Consumer Swift library is using Carthage and Swift Package Manager to m
 defaults to iOS 11 on iPhone 8
 
 ### Running specific platform tests
-iOS 10.3 on iPhone 7:  
+iOS 10.3 on iPhone 7:
 ```
 xcodebuild -project PactConsumerSwift.xcodeproj -scheme "PactConsumerSwift iOS" -destination "OS=10.3,name=iPhone 7" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
 ```
 
-for macOS:  
+for macOS:
 ```
 xcodebuild -project PactConsumerSwift.xcodeproj -scheme "PactConsumerSwift macOS" -destination "arch=x86_64" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
 ```
@@ -50,7 +55,7 @@ For more information, see the [.travis.yml](/.travis.yml) configuration.
 Builds on [Travis CI](https://travis-ci.org/DiUS/pact-consumer-swift/) with pipeline configuration in [.travis.yml](/.travis.yml).
 
 ### Release
-[release.groovy](/release.groovy) script helps with updating the Changelog, tagging the commit with a release version, and publish to Cocoapods.
+[release.sh](/scripts/release.sh) script helps with updating the Changelog, tagging the commit with a release version, and publish to Cocoapods.
 ```
-groovy release.groovy
+./scripts/release.sh 0.7.0 "Bugfix Release"
 ```
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,3 @@
-github "Alamofire/Alamofire" ~> 4.6
-github "Thomvis/BrightFutures" ~> 6.0
-github "Quick/Nimble" ~> 7.0
-github "SwiftyJSON/SwiftyJSON" ~> 4.0
+github "Thomvis/BrightFutures" ~> 8.0
+github "Quick/Nimble" ~> 8.0
+github "SwiftyJSON/SwiftyJSON" ~> 5.0.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -1 +1,2 @@
-github "Quick/Quick" ~> 1.1
+github "Quick/Quick" ~> 2.0
+github "AliSoftware/OHHTTPStubs"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,5 @@
-github "Alamofire/Alamofire" "4.6.0"
-github "Quick/Nimble" "v7.0.3"
-github "Quick/Quick" "v1.2.0"
-github "SwiftyJSON/SwiftyJSON" "4.0.0"
-github "Thomvis/BrightFutures" "6.0.0"
-github "antitypical/Result" "3.2.4"
+github "AliSoftware/OHHTTPStubs" "8.0.0"
+github "Quick/Nimble" "v8.0.5"
+github "Quick/Quick" "v2.2.0"
+github "SwiftyJSON/SwiftyJSON" "5.0.0"
+github "Thomvis/BrightFutures" "8.0.1"
diff --git a/.swiftlint.yml → Configuration/swiftlint.yml b/.swiftlint.yml → Configuration/swiftlint.yml
@@ -15,6 +15,9 @@ force_try:
 type_body_length:
   - 300 # warning
   - 400 # error
+line_length:
+  warning: 128
+  error: 156
 file_length:
   warning: 500
   error: 1200
@@ -30,8 +33,11 @@ identifier_name:
     - id
     - URL
     - url
-    - GET
-    - PUT
     - min
     - max
+    - key
+    - GET
+    - PUT
+    - get
+    - put
 reporter: "xcode"
diff --git a/Gemfile b/Gemfile