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

Minor correction to Swift 2.3 #16

Merged
merged 1 commit into from
Dec 22, 2016
Merged

Conversation

huguesbr
Copy link
Contributor

@huguesbr huguesbr commented Nov 8, 2016

Swift 2.3 support branch.
Please not it need also to be use with the Swift 2.3 branch of InkKit. As this branch is not merge yet and you can't specify a git/branch in a podspec, you need to manually override it in your Podfile...

  pod 'InkKit', :git => 'https://github.com/huguesbr/InkKit.git', :branch => 'swift-2.3'
  pod 'Peek', :git => 'https://github.com/huguesbr/Peek.git', :branch => 'swift-2.3'

Also, same issue that for InkKit, can't find a way to set base branch of the fork as it's not a branch but a tag... See this compare for the correct changes: 2.2.0...huguesbr:swift-2.3

@shaps80
Copy link
Owner

shaps80 commented Nov 8, 2016

Nice one -- I'll take a proper look at this later in the week and try and get it merged in ASAP :)

Thanks for this.

@huguesbr
Copy link
Contributor Author

huguesbr commented Nov 8, 2016

@shaps80 awesome. Let me know if I can do something when you check.

@huguesbr
Copy link
Contributor Author

huguesbr commented Nov 8, 2016

don't forget that this PR should not be merge on master but on 2.2.0...

@shaps80
Copy link
Owner

shaps80 commented Nov 8, 2016

Yep I understand :-)

Shaps

Sent from my iPhone

On 8 Nov 2016, at 16:03, Hugues Bernet-Rollande notifications@github.com wrote:

don't forget that this PR should not be merge on master but on 2.2.0...


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.

@huguesbr
Copy link
Contributor Author

huguesbr commented Nov 8, 2016

;) better safe than sorry ¯_(ツ)_/¯ thx

@huguesbr
Copy link
Contributor Author

@shaps80 congrats for your baby, let me know if you can review this.. ++

@shaps80
Copy link
Owner

shaps80 commented Dec 15, 2016 via email

@huguesbr
Copy link
Contributor Author

@shaps80 cool. keep me posted...

@shaps80 shaps80 changed the base branch from master to swift2.3 December 22, 2016 20:23
@shaps80 shaps80 merged commit e4ee727 into shaps80:swift2.3 Dec 22, 2016
@huguesbr
Copy link
Contributor Author

huguesbr commented Dec 22, 2016 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants