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

Bump rdoc to 6.0 #6600

Merged
merged 2 commits into from Jan 14, 2018
Merged

Bump rdoc to 6.0 #6600

merged 2 commits into from Jan 14, 2018

Conversation

jekyllbot
Copy link
Contributor

@jekyllbot jekyllbot commented Dec 5, 2017

Fix #6599

@DirtyF DirtyF requested a review from a team December 5, 2017 23:03
@DirtyF
Copy link
Member

DirtyF commented Dec 5, 2017

image

Copy link
Member

@Crunch09 Crunch09 left a comment

Choose a reason for hiding this comment

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

:shipit:

@DirtyF
Copy link
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"
Copy link
Member

Choose a reason for hiding this comment

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

Maybe still allow 5.x for Ruby 2.1?

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

Copy link
Member

Choose a reason for hiding this comment

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

like we have for other gems in similar situations.

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

@parkr
Copy link
Member

parkr commented Jan 5, 2018

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

Copy link
Member

@parkr parkr left a comment

Choose a reason for hiding this comment

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

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

@parkr
Copy link
Member

parkr commented Jan 14, 2018

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 4a43a65 into master Jan 14, 2018
@jekyllbot jekyllbot deleted the pull/rdoc-6.0 branch January 14, 2018 21:35
jekyllbot added a commit that referenced this pull request Jan 14, 2018
@jekyll jekyll locked and limited conversation to collaborators Jul 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update dependency constraint to allow for rdoc v6.0.0
6 participants