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

Swift3.0 #7

Merged
merged 3 commits into from Sep 9, 2016
Merged

Swift3.0 #7

merged 3 commits into from Sep 9, 2016

Conversation

davbeck
Copy link
Contributor

@davbeck davbeck commented Jun 16, 2016

I'm submitting this request to master, but I believe that there should be a swift-3 branch instead. What I would propose as the timeline would be:

  1. Maintain 2.3 and 3.0 branches until Xcode 8 GM is released.
  2. Keep the 2.3 branch long term for legacy support.
  3. Merge 3.0 into master.
  4. When the next version of Swift is released, create a legacy swift-3.0 branch off of master.

This way, user's of the framework can target a specific branch if they need legacy support, or master if they want the most current version.

Thoughts?

This was done using the migrator and small fixes afterwards. This does not adopt any of the new style guidlines.
cockscomb added a commit that referenced this pull request Jul 30, 2016
@cockscomb
Copy link
Owner

OK. We should support two versions of Swift with different branches.

I started swift-3 branch here #8 and merged #7 to it.

@cockscomb cockscomb merged commit 7f3f4c6 into cockscomb:master Sep 9, 2016
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.

None yet

2 participants