-
-
Notifications
You must be signed in to change notification settings - Fork 7.5k
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
Add Jazzy Docs #2250
Add Jazzy Docs #2250
Conversation
- Adds Jazzy as a developer dependency using Bundler - Configures Jazzy for Alamofire Jazzy repo: https://github.com/realm/jazzy
Update the readme to point to GitHub Pages (when it is configured in repo's settings) for locally generated Jazzy docs instead of CocoaDocs as it is now deprecated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great! I think we could merge this even before Alamofire 5.
Gemfile
Outdated
@@ -0,0 +1,3 @@ | |||
source "https://rubygems.org" | |||
|
|||
gem "jazzy" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're adding a Ruby environment, can you add cocoapods
to the Gemfile
, and add .ruby-version
(2.4.1) and .ruby-gemset
(alamofire) files too? That way it will integrate with RVM / rbenv automatically.
author_url: http://alamofire.org/ | ||
github_url: https://github.com/Alamofire/Alamofire | ||
module: Alamofire | ||
output: docs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We probably want to refactor our Documentation layout with this. Perhaps we can put these docs in Documentation/jazzy
and move the migration guides Documentation/Migration Guides
. That will require some Xcode project changes for the guides, but there's no need to add the jazzy docs to Xcode at all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After more investigation, it looks like it has to go in the master
branch in a docs
folder to work seamlessly with GitHub Pages. We can sort out where we put everything else in another PR. Might not really be that big of a deal to have a docs
directly full of Jazzy docs and then a Documentation
folder with everything else nested.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good.
Gemfile.lock
Outdated
jazzy | ||
|
||
BUNDLED WITH | ||
1.14.5 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use the latest bundler
.
README.md
Outdated
@@ -3,7 +3,7 @@ | |||
[![Build Status](https://travis-ci.org/Alamofire/Alamofire.svg?branch=master)](https://travis-ci.org/Alamofire/Alamofire) | |||
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/Alamofire.svg)](https://img.shields.io/cocoapods/v/Alamofire.svg) | |||
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) | |||
[![Platform](https://img.shields.io/cocoapods/p/Alamofire.svg?style=flat)](http://cocoadocs.org/docsets/Alamofire) | |||
[![Platform](https://img.shields.io/cocoapods/p/Alamofire.svg?style=flat)](https://Alamofire.github.io/Alamofire) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will be a lower case alamofire.github.io
.
So for my own clarification, would our release workflow change from the last commit being updating the version and finalizing the CHANGELOG to updating the Jazzy docs using On a separate note, thanks for putting this together @aamctustwo! π» |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall, changes look great @aamctustwo. Once you get these minor comments addressed we can get this merged and cut the 4.6.0 release. ππ»
.jazzy.yaml
Outdated
module: Alamofire | ||
output: docs | ||
theme: fullwidth | ||
xcodebuild_arguments: [-workspace,'Alamofire.xcworkspace',-scheme,'Alamofire iOS'] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Spaces after the commas?
README.md
Outdated
@@ -45,7 +45,7 @@ Alamofire is an HTTP networking library written in Swift. | |||
- [x] TLS Certificate and Public Key Pinning | |||
- [x] Network Reachability | |||
- [x] Comprehensive Unit and Integration Test Coverage | |||
- [x] [Complete Documentation](http://cocoadocs.org/docsets/Alamofire) | |||
- [x] [Complete Documentation](https://Alamofire.github.io/Alamofire) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lowercase as @jshier mentioned earlier.
author_url: http://alamofire.org/ | ||
github_url: https://github.com/Alamofire/Alamofire | ||
module: Alamofire | ||
output: docs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After more investigation, it looks like it has to go in the master
branch in a docs
folder to work seamlessly with GitHub Pages. We can sort out where we put everything else in another PR. Might not really be that big of a deal to have a docs
directly full of Jazzy docs and then a Documentation
folder with everything else nested.
@cnoon Yes, I'd recommend the final step to be updating the docs. It might be worth raising a new issue to update the |
Responding to PR feedback on #2250 - Adds spacing in array in `.jazzy.yaml` file - Adds `.ruby-gemset` and `.ruby-version` files for Ruby version managers - Adds `cocoapods` as an explicit Ruby dev dependency - Updates Bundler lock to latest version of Bundler - Updates Readme to use lower-case `ttps://alamofire.github.io`
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work here @aamctustwo...thanks again! π»
We're live! http://alamofire.github.io/Alamofire/index.html |
Issue Link π
Goals β½
Implementation Details π§
docs
folder with Jazzy generated documentationTesting Details π
View documentation:
index.html
in thedocs
folder in a browserGenerate documentation:
bundle exec jazzy
in the root directory of the projectNotesβ οΈ
master
. There's an option in the GitHub Pages configuration to adjust thepublishing source
tomaster branch /docs folder
. See the GitHub Pages documentation.