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

Swift 2 redux #35

Merged
merged 22 commits into from
Oct 3, 2015
Merged

Swift 2 redux #35

merged 22 commits into from
Oct 3, 2015

Conversation

ikesyo
Copy link
Member

@ikesyo ikesyo commented Oct 1, 2015

This takes over the @mattprowse's work of #29.

mattprowse and others added 15 commits July 4, 2015 22:22
* Remove Box dependency.
* Update ReactiveCocoa dependency to target the swift2 branch.
* Update Quick and Nimble dependencies.
* Run Swift 2 converter.
* Fix remaining build errors.
* Update ReactiveCocoa dependency.
* Update Quick and Nimble dependencies to target the "swift-2.0" branch.
* Replace |> with protocol extension dot-method syntax.
* Reimplement flatMapTaskEvents and ignoreTaskData as protocol extensions.
* Update tests to use protocol extension dot-method syntax.
@ikesyo ikesyo mentioned this pull request Oct 1, 2015
@ikesyo ikesyo changed the title [WIP] Swift 2 redux Swift 2 redux Oct 1, 2015
@ikesyo
Copy link
Member Author

ikesyo commented Oct 1, 2015

This seems ready for review. 💫

@mdiep
Copy link
Member

mdiep commented Oct 3, 2015

🎆

mdiep added a commit that referenced this pull request Oct 3, 2015
@mdiep mdiep merged commit b03f5b7 into master Oct 3, 2015
@mdiep mdiep deleted the swift2 branch October 3, 2015 13:58
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.

3 participants