From 57d5fc010b520c7e0b6c004781017a7d86bd8fd7 Mon Sep 17 00:00:00 2001 From: WeTransferBot <38884086+wetransferplatform@users.noreply.github.com> Date: Mon, 30 Aug 2021 10:04:51 +0200 Subject: [PATCH] Merge release 2.5.4 into master (#104) * Created a new release * Update CocoaPods version in README Co-authored-by: J. Doe (https://devcenter.bitrise.io/builds/setting-your-git-credentials-on-build-machines/) Co-authored-by: Bas Broek --- Changelog.md | 7 +++++++ Mocker.podspec | 2 +- README.md | 2 +- Submodules/WeTransfer-iOS-CI | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index c392487..4c9f453 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,10 @@ +### 2.5.4 +- Improve test expressivity ([#101](https://github.com/WeTransfer/Mocker/pull/101)) via [@BasThomas](https://github.com/BasThomas) +- Installation via CocoaPods is Broken ([#94](https://github.com/WeTransfer/Mocker/issues/94)) via [@BasThomas](https://github.com/BasThomas) +- Update to latest pod version in README ([#103](https://github.com/WeTransfer/Mocker/pull/103)) via [@BasThomas](https://github.com/BasThomas) +- Update CI ([#99](https://github.com/WeTransfer/Mocker/pull/99)) via [@kairadiagne](https://github.com/kairadiagne) +- Merge release 2.5.3 into master ([#96](https://github.com/WeTransfer/Mocker/pull/96)) via [@wetransferplatform](https://github.com/wetransferplatform) + ### 2.5.3 - Make sure file extension mocks are matching correctly ([#95](https://github.com/WeTransfer/Mocker/pull/95)) via [@AvdLee](https://github.com/AvdLee) - Replace occurrences of internal `.data` with `Data(contentsOf:)` ([#92](https://github.com/WeTransfer/Mocker/pull/92)) via [@rogerluan](https://github.com/rogerluan) diff --git a/Mocker.podspec b/Mocker.podspec index a460cbe..3af35cd 100644 --- a/Mocker.podspec +++ b/Mocker.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Mocker' - spec.version = '2.5.3' + spec.version = '2.5.4' spec.summary = 'Mock data requests using a custom URLProtocol and run them offline.' spec.description = 'Mocker is a library written in Swift which makes it possible to mock data requests using a custom URLProtocol and run them offline.' diff --git a/README.md b/README.md index 761d98a..3abb28a 100644 --- a/README.md +++ b/README.md @@ -277,7 +277,7 @@ platform :ios, '10.0' use_frameworks! target '' do - pod 'Mocker', '~> 2.5.3' + pod 'Mocker', '~> 2.5.4' end ``` diff --git a/Submodules/WeTransfer-iOS-CI b/Submodules/WeTransfer-iOS-CI index 5177c88..b518e28 160000 --- a/Submodules/WeTransfer-iOS-CI +++ b/Submodules/WeTransfer-iOS-CI @@ -1 +1 @@ -Subproject commit 5177c88e4ad39bc01baee8ff186d3b10692e2f16 +Subproject commit b518e285faf94f4327c6213fd6ba45d2326d80b6