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.

Sign up for GitHub

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

Jekyll 3.0.x #175

Merged
merged 27 commits into from
Feb 1, 2016
Merged

Jekyll 3.0.x #175

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
71dae4c
Bumped Rdiscount to 2.1.8
Stargator Aug 6, 2015
cccf662
Bumped Kramdown to 1.9.0
Stargator Oct 17, 2015
34169aa
Bump Redcarpet to 3.3.3
Stargator Oct 17, 2015
d0ec543
bump jekyll and liquid to 3x
benbalter Oct 27, 2015
4b0625b
use branched version of gem dependencies
benbalter Oct 27, 2015
82c9df2
Merge branch 'bump-kramdown' of https://github.com/Stargator/pages-ge…
benbalter Oct 27, 2015
4242c58
:skull: maruku with :fire:
benbalter Oct 27, 2015
9711908
Merge branch 'bump-rdiscount' of https://github.com/Stargator/pages-g…
benbalter Oct 27, 2015
b677b26
Merge branch 'bump-redcarpet' of https://github.com/Stargator/pages-g…
benbalter Oct 27, 2015
10b6ca7
add rouge, drop maruku
benbalter Oct 27, 2015
9c849e7
Bump redirect from
benbalter Oct 28, 2015
e7cfa42
use released version of jekyll-mentions
benbalter Oct 30, 2015
e3d53af
bump jekyll-mentions
benbalter Oct 30, 2015
a9eea17
bump jemoji
benbalter Nov 1, 2015
f49759a
add jekyll-gist
benbalter Nov 1, 2015
33cbdb3
:gem: bump
benbalter Nov 1, 2015
2c5d4f2
move things around a bit
benbalter Nov 2, 2015
a716425
Bump Jekyll to 3.0.1
benbalter Dec 2, 2015
986e2b1
Merge branch 'master' into jekyll-3
benbalter Dec 4, 2015
5b7e136
re-bump jekyll
benbalter Dec 4, 2015
10a83a8
re-bump liquid
benbalter Dec 4, 2015
ebf5140
Merge branch 'master' into jekyll-3
parkr Jan 8, 2016
17e6ef7
Add jekyll-textile-converter v0.1.0
parkr Jan 8, 2016
b37af2b
Merge branch 'master' into jekyll-3
benbalter Jan 19, 2016
be19789
Add TOML
benbalter Jan 19, 2016
ac44a20
Revert "Add TOML"
benbalter Jan 19, 2016
5ddc85b
Bump jekyll to v3.0.2
parkr Jan 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions lib/github-pages.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
class GitHubPages
VERSION = 39
VERSION = 40

# Jekyll and related dependency versions as used by GitHub Pages.
# For more information see:
# https://help.github.com/articles/using-jekyll-with-pages
def self.gems
{
# Jekyll
"jekyll" => "2.4.0",
"jekyll" => "3.0.0",
"jekyll-coffeescript" => "1.0.1",
"jekyll-sass-converter" => "1.3.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Since jekyll-coffeescript was moved to plugins, shouldn't jekyll-sass-converter be moved as well?

And are the plugins listed in a particular order?

Copy link
Contributor

Choose a reason for hiding this comment

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

jekyll-sass-converter is still a runtime dependency, so we can keep it up here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Out of personal curiosity, can you explain / link to the decision to differentiate between the pre processors?

Copy link
Contributor

Choose a reason for hiding this comment

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

@benbalter Do you mean why we removed coffeescript and not sass? Two reasons: Sass is very heavily used, whereas CoffeeScript is muuuch less-oft used, and because coffeescript had a hard dependency on NodeJS/therubyracer (see jekyll/jekyll#3324 (comment)). So we opted to keep sass-converter because we felt it was used often and it didn't require many extra dependencies so it was less of a hassle to install.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahhh that's right. Thanks for the context. 😸

"jekyll-paginate" => "1.1.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Both jekyll-paginate and jekyll-coffeescript can be moved down to "Plugins" as they're no longer runtime dependencies of Jekyll. :)


# Converters
"kramdown" => "1.5.0",
"maruku" => "0.7.0",
"rdiscount" => "2.1.7",
"redcarpet" => "3.3.2",
"kramdown" => "1.9.0",
"rdiscount" => "2.1.8",
"redcarpet" => "3.3.3",
"RedCloth" => "4.2.9",

# Liquid
"liquid" => "2.6.2",
"liquid" => "3.0.6",

# Highlighters
"pygments.rb" => "0.6.3",
"rouge" => "1.10.1",

# Plugins
"jemoji" => "0.5.0",
"jekyll-mentions" => "0.2.1",
"jekyll-redirect-from" => "0.8.0",
"jemoji" => "0.5.1",
"jekyll-mentions" => "1.0.0",
"jekyll-redirect-from" => "0.9.0",
"jekyll-sitemap" => "0.9.0",
"jekyll-feed" => "0.3.1",
"jekyll-gist" => "1.3.5"
}
end

Expand Down
2 changes: 1 addition & 1 deletion spec/github-pages_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
expect(described_class.versions).to include("github-pages")
end

%w[jekyll kramdown liquid maruku rdiscount redcarpet RedCloth].each do |gem|
%w[jekyll kramdown liquid rouge rdiscount redcarpet RedCloth].each do |gem|
it "exposes #{gem} dependency version" do
expect(described_class.gems[gem]).to be_a(String)
expect(described_class.gems[gem]).not_to be_empty
Expand Down