Skip to content

Release/6.0.0#242

Merged
AliSoftware merged 9 commits into
masterfrom
release/6.0.0
Apr 4, 2017
Merged

Release/6.0.0#242
AliSoftware merged 9 commits into
masterfrom
release/6.0.0

Conversation

@AliSoftware
Copy link
Copy Markdown
Owner

@AliSoftware AliSoftware commented Apr 2, 2017

Checklist

  • I've checked that all new and existing tests pass
  • I've updated the documentation if necessary
  • I've added an entry in the CHANGELOG to credit myself

Description

This branch contains the next release 6.0.0 of OHHTTPStubs.
This also closes #228 & #222.

Motivation and Context

This PR is to ensure the 6.0.0 release branch compiles correctly in all environments, by letting the CI matrix check them all, before officially making the release.

Copy link
Copy Markdown
Collaborator

@Liquidsoul Liquidsoul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ran some tests with Xcode 8.2 and everything seems to be working fine 👍

@AliSoftware
Copy link
Copy Markdown
Owner Author

AliSoftware commented Apr 3, 2017

@Liquidsoul 👌

I've added one last commit to add more information for Carthage users. I think that:

  • given most people have migrated to Swift 3.0 already
  • and that people still using Swift 2.3 won't be in a hurry migrating to OHHTTPStubs 6.0.0 if they haven't migrated to Swift 3.0 yet and those people will still use 5.2.3
  • it's time-consuming to maintain a specific "swift-2.3" branch just for those users (which are likely not many, as projects in Swift 2.3 and using Carthage and not migrated to Swift 3.0 yet is rare by now)

Then I've decided to stop doing swift-2.3 specific branches just for so few people. Those people have alternatives anyway, and I don't want to lose time maintaining that old branch any longer for an obsoleted Swift version which is already not supported anymore in latest Xcode.

Most of Carthage users likely have already migrated to Swift 3.0 anyway so they'll be OK, and those who haven't are likely to stick with old versions of their dependencies anyway, including OHHTTPStubs 5.2.3, so it's probably not worth losing our maintainers time for this

Comment thread README.md Outdated
[![Carthage Swift 3.0/3.1](https://img.shields.io/badge/Carthage-Swift%203.x-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![Build Status](https://travis-ci.org/AliSoftware/OHHTTPStubs.svg?branch=master)](https://travis-ci.org/AliSoftware/OHHTTPStubs)
[![Language: Swift 3.1](https://img.shields.io/badge/Swift-3.1-orange.svg)](https://swift.org)
[![Language: Swift 3.1](https://img.shields.io/badge/Swift-2.3%2F3.0%2F3.1-orange.svg)](https://swift.org)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the markdown badge [Language: Swift 3.1], even if not displayed, be updated to what the shield shows for consistency? (meaning Swift-2.3/3.0/3.1)

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed!

@AliSoftware AliSoftware merged commit 778c65d into master Apr 4, 2017
@AliSoftware AliSoftware deleted the release/6.0.0 branch April 4, 2017 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Proposal for Swift: hasBody OHHTTPStubsTestBlock

2 participants