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

Bundled gem updates #664

Merged
merged 21 commits into from
Dec 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 14 additions & 21 deletions lib/github-pages/dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,30 @@ class Dependencies
"jekyll-commonmark-ghpages" => "0.1.6",

# Misc
"liquid" => "4.0.0",
"rouge" => "3.11.0",
"liquid" => "4.0.3",
"rouge" => "3.13.0",
"github-pages-health-check" => "1.16.1",

# Plugins
"jekyll-redirect-from" => "0.14.0",
"jekyll-sitemap" => "1.2.0",
"jekyll-feed" => "0.11.0",
"jekyll-redirect-from" => "0.15.0",
"jekyll-sitemap" => "1.4.0",
"jekyll-feed" => "0.13.0",
"jekyll-gist" => "1.5.0",
"jekyll-paginate" => "1.1.0",
"jekyll-coffeescript" => "1.1.1",
"jekyll-seo-tag" => "2.5.0",
"jekyll-seo-tag" => "2.6.1",
"jekyll-github-metadata" => "2.12.1",
"jekyll-avatar" => "0.6.0",
"jekyll-remote-theme" => "0.4.0",
"jekyll-avatar" => "0.7.0",
"jekyll-remote-theme" => "0.4.1",

# Plugins to match GitHub.com Markdown
"jemoji" => "0.10.2",
"jekyll-mentions" => "1.4.1",
"jekyll-relative-links" => "0.6.0",
"jekyll-optional-front-matter" => "0.3.0",
"jekyll-readme-index" => "0.2.0",
"jemoji" => "0.11.1",
"jekyll-mentions" => "1.5.1",
"jekyll-relative-links" => "0.6.1",
"jekyll-optional-front-matter" => "0.3.2",
"jekyll-readme-index" => "0.3.0",
"jekyll-default-layout" => "0.1.4",
"jekyll-titles-from-headings" => "0.5.1",

# Pin listen because it's broken on 2.1 & that's what we recommend.
# https://github.com/guard/listen/pull/371
"listen" => "3.1.5",

# Pin activesupport because 5.0 is broken on 2.1
"activesupport" => "4.2.11.1",
"jekyll-titles-from-headings" => "0.5.3",
}.freeze

# Jekyll and related dependency versions as used by GitHub Pages.
Expand Down
6 changes: 3 additions & 3 deletions lib/github-pages/plugins.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class Plugins

# Themes
THEMES = {
"jekyll-swiss" => "0.4.0",
"minima" => "2.5.0",
"jekyll-theme-primer" => "0.5.3",
"jekyll-swiss" => "1.0.0",
"minima" => "2.5.1",
"jekyll-theme-primer" => "0.5.4",
"jekyll-theme-architect" => "0.1.1",
"jekyll-theme-cayman" => "0.1.1",
"jekyll-theme-dinky" => "0.1.1",
Expand Down
2 changes: 1 addition & 1 deletion spec/github-pages/dependencies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
describe(GitHubPages::Dependencies) do
CORE_DEPENDENCIES = %w(
jekyll kramdown liquid rouge jekyll-sass-converter
github-pages-health-check listen activesupport
github-pages-health-check
).freeze
PLUGINS = described_class::VERSIONS.keys - CORE_DEPENDENCIES

Expand Down
2 changes: 1 addition & 1 deletion spec/github-pages/integration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def rm_destination
contents = File.read(__FILE__)
contexts = contents.scan(/context \"(.*?)\"/)
missing = GitHubPages::Dependencies::VERSIONS.keys - contexts.flatten
missing -= %w(listen activesupport github-pages-health-check)
missing -= %w(github-pages-health-check)
msg = "The following dependencies are missing integration tests: #{missing.join(", ")}"
expect(missing).to be_empty, msg
end
Expand Down