Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to Swift 2.2 #378

Merged
merged 2 commits into from
Apr 8, 2016
Merged

Adapt to Swift 2.2 #378

merged 2 commits into from
Apr 8, 2016

Conversation

tcard
Copy link
Contributor

@tcard tcard commented Apr 8, 2016

WIP to check via Travis if it's backwards compatible. If it isn't we need to figure out how/if we're going to maintain two versions.

@tcard tcard changed the title Adapt to swift 2.2 Adapt to Swift 2.2 Apr 8, 2016
@ricardopereira
Copy link
Contributor

You need to change the travis file to use Xcode 7.3.

osx_image: xcode7.3

@tcard
Copy link
Contributor Author

tcard commented Apr 8, 2016

Please don't merge anything before merging this. I'm making a 0.8.1-swift2.1 release with the current master branch (which is finally passing the tests). Then a new branch, swift2.1, from the current master as well. Then we can merge this PR, and make a 0.8.1 release that is supposed to be compatible with Swift 2.2 onwards. From then on, every PR merged to master will have to be merged to swift2.1 as well. (We'll use squashed commits and cherry-picking to facilitate this.)

Does the plan sound good?

@tcard tcard force-pushed the adapt-to-swift-2.2 branch from b325cd0 to d1bcbce Compare April 8, 2016 16:20
@tcard tcard merged this pull request into master Apr 8, 2016
tcard added a commit that referenced this pull request Apr 8, 2016
* Adapt to Swift 2.2.

* README: Update installation lines for Xcode <=7.2 and >=7.3.
@ricardopereira ricardopereira deleted the adapt-to-swift-2.2 branch April 8, 2016 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants