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

Bump rdoc to 6.0 #6600

Merged
merged 2 commits into from Jan 14, 2018

Conversation

Projects
None yet
6 participants
@jekyllbot
Contributor

jekyllbot commented Dec 5, 2017

Fix #6599

@DirtyF DirtyF requested a review from jekyll/core Dec 5, 2017

@DirtyF

This comment has been minimized.

Member

DirtyF commented Dec 5, 2017

image

@DirtyF

This comment has been minimized.

Member

DirtyF commented Dec 5, 2017

Note: rdoc is an optional dependency and now requires Ruby >= 2.2.2

Gemfile Outdated
@@ -75,7 +75,7 @@ group :jekyll_optional_dependencies do
gem "jekyll-redirect-from"
gem "kramdown", "~> 1.14"
gem "mime-types", "~> 3.0"
gem "rdoc", "~> 5.0"
gem "rdoc", "~> 6.0"

This comment has been minimized.

@pathawks

pathawks Dec 5, 2017

Member

Maybe still allow 5.x for Ruby 2.1?

gem "rdoc", [">= 5.0", "< 7.0"]

This comment has been minimized.

@ashmaroli

ashmaroli Dec 6, 2017

Member

like we have for other gems in similar situations.

gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
@parkr

This comment has been minimized.

Member

parkr commented Jan 5, 2018

We've dropped Ruby 2.1, if that changes anything.

@parkr

parkr approved these changes Jan 14, 2018

Helps support Ruby 2.2.0 & 2.2.1, which we still theoretically support.

@parkr

This comment has been minimized.

Member

parkr commented Jan 14, 2018

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 4a43a65 into master Jan 14, 2018

3 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jekyllbot jekyllbot deleted the pull/rdoc-6.0 branch Jan 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment