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 kramdown to 1.14.0 for rouge 2 support #6183

Merged
merged 1 commit into from Jul 5, 2017

Conversation

Crunch09
Copy link
Member

@Crunch09
Copy link
Member Author

This fixes the rendering issue of raw tags mentioned by @DirtyF in #5919

jekyll.gemspec Outdated
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("colorator", "~> 1.0")
s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
s.add_runtime_dependency("jekyll-watch", "~> 1.1")
s.add_runtime_dependency("kramdown", "~> 1.3")
s.add_runtime_dependency("kramdown", "~> 1.14", ">= 1.14.0")
Copy link
Member Author

Choose a reason for hiding this comment

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

I wasn't sure if we should still allow versions < 1.14 when using rouge 1 but it would make things quite complicated and a bump should still work with rouge 1.

Copy link
Member

Choose a reason for hiding this comment

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

~> 1.14 is the same as >= 1.14.0, < 2.0.

@pathawks
Copy link
Member

/cc: @jekyll/ecosystem

@jekyllbot jekyllbot self-assigned this Jun 26, 2017
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.

Changes to the gemspec & Gemfile are requested but otherwise LGTM! 👍

So kramdown 1.14 is the first version to support Rouge 2?

Gemfile Outdated
@@ -70,7 +70,7 @@ group :jekyll_optional_dependencies do
gem "jekyll-gist"
gem "jekyll-paginate"
gem "jekyll-redirect-from"
gem "kramdown", "~> 1.9"
gem "kramdown", "~> 1.14", ">= 1.14.0"
Copy link
Member

Choose a reason for hiding this comment

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

This is unnecessary – ~> 1.14 is sufficient. 😄

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you! I always mix up these things :(

jekyll.gemspec Outdated
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("colorator", "~> 1.0")
s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
s.add_runtime_dependency("jekyll-watch", "~> 1.1")
s.add_runtime_dependency("kramdown", "~> 1.3")
s.add_runtime_dependency("kramdown", "~> 1.14", ">= 1.14.0")
Copy link
Member

Choose a reason for hiding this comment

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

~> 1.14 is the same as >= 1.14.0, < 2.0.

@Crunch09
Copy link
Member Author

Crunch09 commented Jun 26, 2017

Yes, it seemed to work fine at first but e.g. raw tags were not properly highlighted before gettalong/kramdown#413.

@DirtyF DirtyF added this to the 3.6 milestone Jul 2, 2017
@parkr parkr merged commit 273fdbd into jekyll:rouge-1-and-2 Jul 5, 2017
@Crunch09 Crunch09 deleted the rouge-2-bump-kramdown branch July 5, 2017 17:53
@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.

None yet

5 participants