From 5fb311ff933dd975e9e93e2b4f65b81f3615b650 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 21 Sep 2016 21:02:56 -0400 Subject: [PATCH] Swap `github-pages` gem with latest Jekyll - Add Jekyll plugins --- Gemfile | 9 ++++- Gemfile.lock | 111 +++++++++++++++------------------------------------ 2 files changed, 39 insertions(+), 81 deletions(-) diff --git a/Gemfile b/Gemfile index 6c08bcf..0279aaf 100644 --- a/Gemfile +++ b/Gemfile @@ -9,16 +9,21 @@ source "https://rubygems.org" # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "github-pages", group: :jekyll_plugins +# gem "github-pages", group: :jekyll_plugins # If you want to use Jekyll native, uncomment the line below. # To upgrade, run `bundle update`. -# gem "jekyll" +gem "jekyll", :git => "https://github.com/jekyll/jekyll.git" gem "wdm", "~> 0.1.0" if Gem.win_platform? # If you have any plugins, put them here! group :jekyll_plugins do # gem "jekyll-archives" + gem "jekyll-paginate" + gem "jekyll-sitemap" + gem "jekyll-gist" + gem "jekyll-feed" + gem "jemoji" end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index f155ec9..128bba5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,89 +1,47 @@ +GIT + remote: https://github.com/jekyll/jekyll.git + revision: 87c745573fde23d5b7416e57774f95484752e288 + specs: + jekyll (3.2.1) + colorator (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (~> 1.7) + safe_yaml (~> 1.0) + GEM remote: https://rubygems.org/ specs: - activesupport (4.2.7) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) colorator (1.1.0) - ethon (0.9.0) - ffi (>= 1.3.0) - execjs (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.14) ffi (1.9.14-x64-mingw32) forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (96) - activesupport (= 4.2.7) - github-pages-health-check (= 1.2.0) - jekyll (= 3.2.1) - jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.5.1) - jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.0.2) - jekyll-mentions (= 1.2.0) - jekyll-paginate (= 1.1.0) - jekyll-redirect-from (= 0.11.0) - jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 2.0.0) - jekyll-sitemap (= 0.10.0) - jemoji (= 0.7.0) - kramdown (= 1.11.1) - liquid (= 3.0.6) - listen (= 3.0.6) - mercenary (~> 0.3) - minima (= 1.2.0) - rouge (= 1.11.1) - terminal-table (~> 1.4) - github-pages-health-check (1.2.0) - addressable (~> 2.3) - net-dns (~> 0.8) - octokit (~> 4.0) - public_suffix (~> 1.4) - typhoeus (~> 0.7) html-pipeline (2.4.2) activesupport (>= 2) nokogiri (>= 1.4) i18n (0.7.0) - jekyll (3.2.1) - colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (~> 1.7) - safe_yaml (~> 1.0) - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-feed (0.5.1) + jekyll-feed (0.7.0) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-github-metadata (2.0.2) - jekyll (~> 3.1) - octokit (~> 4.0) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) - html-pipeline (~> 2.3) - jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.11.0) - jekyll (>= 2.0) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-seo-tag (2.0.0) - jekyll (~> 3.1) - jekyll-sitemap (0.10.0) + jekyll-sass-converter (1.4.0) + sass (~> 3.4) + jekyll-sitemap (0.11.0) + addressable (~> 2.4.0) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) jemoji (0.7.0) @@ -92,17 +50,15 @@ GEM html-pipeline (~> 2.2) jekyll (>= 3.0) json (1.8.3) - kramdown (1.11.1) + kramdown (1.12.0) liquid (3.0.6) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) mini_portile2 (2.1.0) - minima (1.2.0) minitest (5.9.0) multipart-post (2.0.0) - net-dns (0.8.0) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) @@ -114,7 +70,6 @@ GEM pathutil (0.14.0) forwardable-extended (~> 2.6) pkg-config (1.1.7) - public_suffix (1.5.3) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -124,23 +79,21 @@ GEM sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - terminal-table (1.7.2) - unicode-display_width (~> 1.1.1) thread_safe (0.3.5) - typhoeus (0.8.0) - ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - unicode-display_width (1.1.1) - wdm (0.1.1) PLATFORMS ruby x64-mingw32 DEPENDENCIES - github-pages - wdm (~> 0.1.0) + jekyll! + jekyll-feed + jekyll-gist + jekyll-paginate + jekyll-sitemap + jemoji BUNDLED WITH - 1.12.5 + 1.13.1 -- 2.43.0