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

Use Swift 2.1.1 from Xcode 7.2 by default. #416

Merged
merged 4 commits into from
Dec 14, 2015
Merged

Conversation

nlutsenko
Copy link
Contributor

Xcode 7.2 is using Swift 2.1.1 by default, making jazzy fail completely if trying to generate docs only when the latest Xcode is installed.
Tbh, didn't test the behavior of Jazzy on Swift 2.1.1, but I would assume it didn't quite change.
@jpsim can you try testing this with Realm docs?

@nlutsenko nlutsenko force-pushed the patch-1 branch 2 times, most recently from 325b72c to 5f609c1 Compare December 14, 2015 17:25
@jpsim
Copy link
Collaborator

jpsim commented Dec 14, 2015

Thanks for this @nlutsenko! You'll have to update the .travis.yml file:

- osx_image: xcode7.2
  env: TRAVIS_SWIFT_VERSION=2.1.1

@nlutsenko
Copy link
Contributor Author

Sure, let me try that, I actually am not sure if it will succeed or not, since specs are generated for 2.1.

@jpsim
Copy link
Collaborator

jpsim commented Dec 14, 2015

There were very few changes from Swift 2.1 -> 2.1.1, so I'd try running the specs with 2.1.1 first to see if anything actually needs changing.

@nlutsenko nlutsenko force-pushed the patch-1 branch 2 times, most recently from 54cc6a0 to 6abed98 Compare December 14, 2015 17:45
Xcode 7.2 is using Swift 2.1.1 by default, making jazzy fail completely if trying to generate docs only when the latest Xcode is installed.
Tbh, didn't test the behavior of Jazzy on Swift 2.1.1, but I would assume it didn't quite change.
@jpsim can you try testing this with Realm docs?
@nlutsenko
Copy link
Contributor Author

Updated stuff, let's see what happens now.

@jpsim
Copy link
Collaborator

jpsim commented Dec 14, 2015

This looks good, but needs a changelog entry too!

@nlutsenko
Copy link
Contributor Author

Ehm, wow! It passes now! Whee!

@nlutsenko
Copy link
Contributor Author

Ok, sir, let me get right on that.

@nlutsenko
Copy link
Contributor Author

Done, let me know if you want to squash all of these.


##### Enhancements

* Add `--sdk [iphone|watch|appletv][os|simulator]|macosx` option for Objective-C
projects.
Copy link
Collaborator

Choose a reason for hiding this comment

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

All this whitespace was intentional. Markdown treats it as a line break in the rendered output.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry. It's TextMate, not me :P

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will fix in a bit.

@nlutsenko
Copy link
Contributor Author

Should be good now.

@jpsim
Copy link
Collaborator

jpsim commented Dec 14, 2015

Thanks again for this.

jpsim added a commit that referenced this pull request Dec 14, 2015
Use Swift 2.1.1 from Xcode 7.2 by default.
@jpsim jpsim merged commit 4f4235f into realm:master Dec 14, 2015
1ec5 added a commit to mapbox/mapbox-gl-native that referenced this pull request Dec 21, 2015
Work around an error that will go away once realm/jazzy#416 makes it into a release.
1ec5 added a commit to mapbox/mapbox-gl-native that referenced this pull request Dec 23, 2015
Work around an error that will go away once realm/jazzy#416 makes it into a release.
@nlutsenko nlutsenko deleted the patch-1 branch December 25, 2015 08:50
@pigeondotdev pigeondotdev modified the milestone: The Past Nov 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants