diff --git a/CHANGELOG.md b/CHANGELOG.md index 4949f23b..a8036518 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,16 @@ # OHHTTPStubs — CHANGELOG +## [4.5.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.5.0) — tvOS + +* Added support for tvOS. + [@tiagomartinho](https://github.com/tiagomartinho), [#134](https://github.com/AliSoftware/OHHTTPStubs/pull/134) + ## [4.4.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.4.0) -* Fixed issue with Umbrella Headers ([#127](https://github.com/AliSoftware/OHHTTPStubs/issues/127), [#131](https://github.com/AliSoftware/OHHTTPStubs/pull/131)) -* Added methods for creating `OHHTTPStubsResponse`s from `NSURL`s that represent file system resources ([@MaxGabriel](https://github.com/MaxGabriel), [#129](https://github.com/AliSoftware/OHHTTPStubs/pull/129)) +* Fixed issue with Umbrella Headers. + [#127](https://github.com/AliSoftware/OHHTTPStubs/issues/127), [#131](https://github.com/AliSoftware/OHHTTPStubs/pull/131) +* Added methods for creating `OHHTTPStubsResponse`s from `NSURL`s that represent file system resources. + [@MaxGabriel](https://github.com/MaxGabriel), [#129](https://github.com/AliSoftware/OHHTTPStubs/pull/129) * Bumped Swift subspec compatibility to OSX 10.9 instead of 10.7. @@ -16,29 +23,34 @@ ## [4.2.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.2.1) -* Fix the Examples Xcode project + lib Podfile that were referencing old target names ([mikelupo](https://github.com/mikelupo), [#117](https://github.com/AliSoftware/OHHTTPStubs/pull/117)) -* Added two new constants for download speed: `OHHTTPStubsDownloadSpeed1KBPS` = 1kbps and `OHHTTPStubsDownloadSpeedSLOW` = 1.5 kpbs. ([mikelupo](https://github.com/mikelupo), [#114](https://github.com/AliSoftware/OHHTTPStubs/pull/114)) +* Fix the Examples Xcode project + lib Podfile that were referencing old target names + [@mikelupo](https://github.com/mikelupo), [#117](https://github.com/AliSoftware/OHHTTPStubs/pull/117) +* Added two new constants for download speed: `OHHTTPStubsDownloadSpeed1KBPS` = 1kbps and `OHHTTPStubsDownloadSpeedSLOW` = 1.5 kpbs. + [@mikelupo](https://github.com/mikelupo), [#114](https://github.com/AliSoftware/OHHTTPStubs/pull/114) -## [4.2.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.2.0) +## [4.2.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.2.0) — Splitting in subspecs -* Added support for stubs written in the [Mocktail](https://github.com/square/objc-mocktail) format ([@JinlianWang](https://github.com/JinlianWang), [#108](https://github.com/AliSoftware/OHHTTPStubs/pull/108)) * The `OHHTTPStubs` spec has been splitted into **multiple subspecs**: * The default subspec (used when you simply use `pod 'OHHTTPStubs'` in your `Podfile`) contains the subspecs `Core`, `NSURLSession`, `JSON` & `OHPathHelpers` (so that it matches the features that most people use). * Other optional subspecs are `HTTPMessage` and `Mocktail` (which are opt-in because used by much less people). If you want to use them, you'll need to request them explicitly in your `Podfile` using `pod 'OHHTTPStubs/Mocktail` for example. * The iOS Unit Tests are now also run for the framework as well as for the static library, to ensure the tests pass in both contexts _(because frameworks sometimes introduce subtleties like when using `NSBundle`, so it's worth testing in that context too)_ +* Added support for stubs written in the [Mocktail](https://github.com/square/objc-mocktail) format. + [@JinlianWang](https://github.com/JinlianWang), [#108](https://github.com/AliSoftware/OHHTTPStubs/pull/108) -## [4.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.1.0) +## [4.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.1.0) — watchOS 2 * Added support for using `OHHTTPStubs` in watchOS 2.0 targets. * Improved compatibility macros (nullability annotations) — and tested against Xcode 7 beta 4. ## [4.0.2](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.0.2) -* Fix `OHResourceBundle` name mismatch between header and implementation ([@tibr](https://github.com/tibr), [#103](https://github.com/AliSoftware/OHHTTPStubs/pull/103)) +* Fix `OHResourceBundle` name mismatch between header and implementation. + [@tibr](https://github.com/tibr), [#103](https://github.com/AliSoftware/OHHTTPStubs/pull/103) ## [4.0.1](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.0.1) -* Fix threading in `NSURLProtocol` subclass calling `NSURLProtocolClient` callbacks from wrong thread. ([@nsprogrammer](https://github.com/nsprogrammer), [#96](https://github.com/AliSoftware/OHHTTPStubs/pull/96)) +* Fix threading in `NSURLProtocol` subclass calling `NSURLProtocolClient` callbacks from wrong thread. + [@nsprogrammer](https://github.com/nsprogrammer), [#96](https://github.com/AliSoftware/OHHTTPStubs/pull/96) ## [4.0.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/4.0.0) — Improvements for Swift @@ -49,13 +61,15 @@ ## [3.1.12](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.12) -* Fixed issue with HTTP 300 return code (multiple-choice) that is not supposed to redirect. ([@tarbrain](https://github.com/tarbrain), [#92](https://github.com/AliSoftware/OHHTTPStubs/pull/92)) +* Fixed issue with HTTP 300 return code (multiple-choice) that is not supposed to redirect. + [@tarbrain](https://github.com/tarbrain), [#92](https://github.com/AliSoftware/OHHTTPStubs/pull/92) ## [3.1.11](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/3.1.11) * Added [Carthage](https://github.com/Carthage/Carthage) support * Splitted the Xcode projects for more clarity (one dedicated to build the lib and run Unit Tests, and one for the Demo) -* Got rid of the `git submodule` used for Unit Tests against [AFNetworking](https://github.com/AFNetworking/AFNetworking) — it is now imported using [CocoaPods](http://cocoapods.org) and only for the lib's Unit Tests targets ([@corinnekrych](https://github.com/corinnekrych), [#90](https://github.com/AliSoftware/OHHTTPStubs/pull/90)) +* Got rid of the `git submodule` used for Unit Tests against [AFNetworking](https://github.com/AFNetworking/AFNetworking) — it is now imported using [CocoaPods](http://cocoapods.org) and only for the lib's Unit Tests targets. + [@corinnekrych](https://github.com/corinnekrych), [#90](https://github.com/AliSoftware/OHHTTPStubs/pull/90) * Improved [Travis-CI](https://travis-ci.org/AliSoftware/OHHTTPStubs) integration. We now use a build matrix to have paralellized and independant builds for each scheme (iOS Static Lib, iOS Dynamic Framework, OSX Framework) * Fixed [#80](https://github.com/AliSoftware/OHHTTPStubs/issues/80) again (there was still an issue for people using Xcode 5 & SDK 7.1… if those people still exists) diff --git a/Examples/ObjC/Podfile.lock b/Examples/ObjC/Podfile.lock index 12d2499b..30e57bcd 100644 --- a/Examples/ObjC/Podfile.lock +++ b/Examples/ObjC/Podfile.lock @@ -1,17 +1,17 @@ PODS: - - OHHTTPStubs (4.4.0): - - OHHTTPStubs/Default (= 4.4.0) - - OHHTTPStubs/Core (4.4.0) - - OHHTTPStubs/Default (4.4.0): + - OHHTTPStubs (4.5.0): + - OHHTTPStubs/Default (= 4.5.0) + - OHHTTPStubs/Core (4.5.0) + - OHHTTPStubs/Default (4.5.0): - OHHTTPStubs/Core - OHHTTPStubs/JSON - OHHTTPStubs/NSURLSession - OHHTTPStubs/OHPathHelpers - - OHHTTPStubs/JSON (4.4.0): + - OHHTTPStubs/JSON (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/NSURLSession (4.4.0): + - OHHTTPStubs/NSURLSession (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/OHPathHelpers (4.4.0) + - OHHTTPStubs/OHPathHelpers (4.5.0) DEPENDENCIES: - OHHTTPStubs (from `../..`) @@ -21,6 +21,6 @@ EXTERNAL SOURCES: :path: ../.. SPEC CHECKSUMS: - OHHTTPStubs: 1a95a653b78287a1fdb44eb38364b43257ac3550 + OHHTTPStubs: e573e76dd8bcd7ee5fcc6c3d86251551f4261e0c COCOAPODS: 0.39.0 diff --git a/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json b/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json index 70233cdc..1942fa2d 100644 --- a/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json +++ b/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json @@ -1,6 +1,6 @@ { "name": "OHHTTPStubs", - "version": "4.4.0", + "version": "4.5.0", "summary": "Framework to stub your network requests like HTTP and help you write network unit tests with XCTest.", "description": "A class to stub network requests easily:\n\n * Test your apps with fake network data (stubbed from file)\n * You can also customize your response headers and status code\n * Use customized stubs depending on the requests\n * Use custom response time to simulate slow network.\n * This works with any request (HTTP, HTTPS, or any protocol) sent using\n the iOS URL Loading System (NSURLConnection, NSURLSession, AFNetworking, …)\n * This is really useful in unit testing, when you need to test network features\n but don't want to hit the real network and fake some response data instead.\n * Has useful convenience methods to stub JSON content or fixture from a file\n * Compatible with Swift", "homepage": "https://github.com/AliSoftware/OHHTTPStubs", @@ -10,7 +10,7 @@ }, "source": { "git": "https://github.com/AliSoftware/OHHTTPStubs.git", - "tag": "4.4.0" + "tag": "4.5.0" }, "frameworks": [ "Foundation", @@ -20,7 +20,8 @@ "platforms": { "ios": "5.0", "osx": "10.7", - "watchos": "2.0" + "watchos": "2.0", + "tvos": "9.0" }, "default_subspecs": "Default", "subspecs": [ diff --git a/Examples/ObjC/Pods/Manifest.lock b/Examples/ObjC/Pods/Manifest.lock index 12d2499b..30e57bcd 100644 --- a/Examples/ObjC/Pods/Manifest.lock +++ b/Examples/ObjC/Pods/Manifest.lock @@ -1,17 +1,17 @@ PODS: - - OHHTTPStubs (4.4.0): - - OHHTTPStubs/Default (= 4.4.0) - - OHHTTPStubs/Core (4.4.0) - - OHHTTPStubs/Default (4.4.0): + - OHHTTPStubs (4.5.0): + - OHHTTPStubs/Default (= 4.5.0) + - OHHTTPStubs/Core (4.5.0) + - OHHTTPStubs/Default (4.5.0): - OHHTTPStubs/Core - OHHTTPStubs/JSON - OHHTTPStubs/NSURLSession - OHHTTPStubs/OHPathHelpers - - OHHTTPStubs/JSON (4.4.0): + - OHHTTPStubs/JSON (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/NSURLSession (4.4.0): + - OHHTTPStubs/NSURLSession (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/OHPathHelpers (4.4.0) + - OHHTTPStubs/OHPathHelpers (4.5.0) DEPENDENCIES: - OHHTTPStubs (from `../..`) @@ -21,6 +21,6 @@ EXTERNAL SOURCES: :path: ../.. SPEC CHECKSUMS: - OHHTTPStubs: 1a95a653b78287a1fdb44eb38364b43257ac3550 + OHHTTPStubs: e573e76dd8bcd7ee5fcc6c3d86251551f4261e0c COCOAPODS: 0.39.0 diff --git a/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme b/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme index ed4beb9e..3e7a30d9 100644 --- a/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme +++ b/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme @@ -14,7 +14,7 @@ buildForArchiving = "YES"> diff --git a/Examples/Swift/Podfile.lock b/Examples/Swift/Podfile.lock index 6e93e3f4..50ea0ceb 100644 --- a/Examples/Swift/Podfile.lock +++ b/Examples/Swift/Podfile.lock @@ -1,18 +1,18 @@ PODS: - - OHHTTPStubs (4.4.0): - - OHHTTPStubs/Default (= 4.4.0) - - OHHTTPStubs/Core (4.4.0) - - OHHTTPStubs/Default (4.4.0): + - OHHTTPStubs (4.5.0): + - OHHTTPStubs/Default (= 4.5.0) + - OHHTTPStubs/Core (4.5.0) + - OHHTTPStubs/Default (4.5.0): - OHHTTPStubs/Core - OHHTTPStubs/JSON - OHHTTPStubs/NSURLSession - OHHTTPStubs/OHPathHelpers - - OHHTTPStubs/JSON (4.4.0): + - OHHTTPStubs/JSON (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/NSURLSession (4.4.0): + - OHHTTPStubs/NSURLSession (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/OHPathHelpers (4.4.0) - - OHHTTPStubs/Swift (4.4.0): + - OHHTTPStubs/OHPathHelpers (4.5.0) + - OHHTTPStubs/Swift (4.5.0): - OHHTTPStubs/Core DEPENDENCIES: @@ -24,6 +24,6 @@ EXTERNAL SOURCES: :path: ../.. SPEC CHECKSUMS: - OHHTTPStubs: 1a95a653b78287a1fdb44eb38364b43257ac3550 + OHHTTPStubs: e573e76dd8bcd7ee5fcc6c3d86251551f4261e0c COCOAPODS: 0.39.0 diff --git a/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json b/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json index 70233cdc..1942fa2d 100644 --- a/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json +++ b/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json @@ -1,6 +1,6 @@ { "name": "OHHTTPStubs", - "version": "4.4.0", + "version": "4.5.0", "summary": "Framework to stub your network requests like HTTP and help you write network unit tests with XCTest.", "description": "A class to stub network requests easily:\n\n * Test your apps with fake network data (stubbed from file)\n * You can also customize your response headers and status code\n * Use customized stubs depending on the requests\n * Use custom response time to simulate slow network.\n * This works with any request (HTTP, HTTPS, or any protocol) sent using\n the iOS URL Loading System (NSURLConnection, NSURLSession, AFNetworking, …)\n * This is really useful in unit testing, when you need to test network features\n but don't want to hit the real network and fake some response data instead.\n * Has useful convenience methods to stub JSON content or fixture from a file\n * Compatible with Swift", "homepage": "https://github.com/AliSoftware/OHHTTPStubs", @@ -10,7 +10,7 @@ }, "source": { "git": "https://github.com/AliSoftware/OHHTTPStubs.git", - "tag": "4.4.0" + "tag": "4.5.0" }, "frameworks": [ "Foundation", @@ -20,7 +20,8 @@ "platforms": { "ios": "5.0", "osx": "10.7", - "watchos": "2.0" + "watchos": "2.0", + "tvos": "9.0" }, "default_subspecs": "Default", "subspecs": [ diff --git a/Examples/Swift/Pods/Manifest.lock b/Examples/Swift/Pods/Manifest.lock index 6e93e3f4..50ea0ceb 100644 --- a/Examples/Swift/Pods/Manifest.lock +++ b/Examples/Swift/Pods/Manifest.lock @@ -1,18 +1,18 @@ PODS: - - OHHTTPStubs (4.4.0): - - OHHTTPStubs/Default (= 4.4.0) - - OHHTTPStubs/Core (4.4.0) - - OHHTTPStubs/Default (4.4.0): + - OHHTTPStubs (4.5.0): + - OHHTTPStubs/Default (= 4.5.0) + - OHHTTPStubs/Core (4.5.0) + - OHHTTPStubs/Default (4.5.0): - OHHTTPStubs/Core - OHHTTPStubs/JSON - OHHTTPStubs/NSURLSession - OHHTTPStubs/OHPathHelpers - - OHHTTPStubs/JSON (4.4.0): + - OHHTTPStubs/JSON (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/NSURLSession (4.4.0): + - OHHTTPStubs/NSURLSession (4.5.0): - OHHTTPStubs/Core - - OHHTTPStubs/OHPathHelpers (4.4.0) - - OHHTTPStubs/Swift (4.4.0): + - OHHTTPStubs/OHPathHelpers (4.5.0) + - OHHTTPStubs/Swift (4.5.0): - OHHTTPStubs/Core DEPENDENCIES: @@ -24,6 +24,6 @@ EXTERNAL SOURCES: :path: ../.. SPEC CHECKSUMS: - OHHTTPStubs: 1a95a653b78287a1fdb44eb38364b43257ac3550 + OHHTTPStubs: e573e76dd8bcd7ee5fcc6c3d86251551f4261e0c COCOAPODS: 0.39.0 diff --git a/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme b/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme index 89827827..a5e799d4 100644 --- a/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme +++ b/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme @@ -14,7 +14,7 @@ buildForArchiving = "YES"> diff --git a/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist b/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist index 32e134d0..b18f72fb 100644 --- a/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist +++ b/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.4.0 + 4.5.0 CFBundleSignature ???? CFBundleVersion diff --git a/OHHTTPStubs.podspec b/OHHTTPStubs.podspec index 6f1eafda..41c2827f 100644 --- a/OHHTTPStubs.podspec +++ b/OHHTTPStubs.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "OHHTTPStubs" - s.version = "4.4.0" + s.version = "4.5.0" s.summary = "Framework to stub your network requests like HTTP and help you write network unit tests with XCTest." s.description = <<-DESC.gsub(/^ +\|/,'') diff --git a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m index 90046781..b889f86d 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m @@ -23,7 +23,7 @@ ***********************************************************************************/ #import -// tvOS & WatchOS deprecate use of NSURLConnection but these tests are based on it +// tvOS & watchOS deprecate use of NSURLConnection but these tests are based on it #if (!defined(__TV_OS_VERSION_MIN_REQUIRED) && !defined(__WATCH_OS_VERSION_MIN_REQUIRED)) #import diff --git a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m index 7e2baf98..e9990a0d 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m @@ -23,7 +23,7 @@ ***********************************************************************************/ #import -// tvOS & WatchOS deprecate use of NSURLConnection but these tests are based on it +// tvOS & watchOS deprecate use of NSURLConnection but these tests are based on it #if (!defined(__TV_OS_VERSION_MIN_REQUIRED) && !defined(__WATCH_OS_VERSION_MIN_REQUIRED)) #import diff --git a/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m b/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m index 534f36a0..931d1781 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m @@ -23,7 +23,7 @@ ***********************************************************************************/ #import -// tvOS & WatchOS deprecate use of NSURLConnection but these tests are based on it +// tvOS & watchOS deprecate use of NSURLConnection but these tests are based on it #if (!defined(__TV_OS_VERSION_MIN_REQUIRED) && !defined(__WATCH_OS_VERSION_MIN_REQUIRED)) #import diff --git a/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m b/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m index 4133874e..ab7986bc 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m +++ b/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m @@ -23,7 +23,7 @@ ***********************************************************************************/ #import -// tvOS & WatchOS deprecate use of NSURLConnection but these tests are based on it +// tvOS & watchOS deprecate use of NSURLConnection but these tests are based on it #if (!defined(__TV_OS_VERSION_MIN_REQUIRED) && !defined(__WATCH_OS_VERSION_MIN_REQUIRED)) #import