From 14de61e400938c6590b7d1940733c39cd1ee9a0e Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sun, 18 Nov 2018 16:51:09 +0100 Subject: [PATCH] Update Jekyll and rm livereload plugin (part of jekyll now) --- Gemfile | 4 +-- Gemfile.lock | 65 +++++++++++++++++++++++++--------------------- docker-compose.yml | 2 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index faeda14..6854f84 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,8 @@ ruby RUBY_VERSION # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "3.4.0" +gem "jekyll", ">= 3.6.3" + # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. @@ -19,7 +20,6 @@ gem "jekyll", "3.4.0" group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" gem "jekyll-sitemap" - gem "jekyll-livereload" end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 37366a5..39c22bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,61 +1,68 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) + concurrent-ruby (1.1.3) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.2) - ffi (1.9.17) + eventmachine (1.2.7) + ffi (1.9.25) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - jekyll (3.4.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.5) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.8.0) + jekyll-feed (0.11.0) jekyll (~> 3.3) - jekyll-livereload (0.2.2) - em-websocket (~> 0.5) - jekyll (~> 3.0) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-sitemap (1.0.0) + jekyll-sitemap (1.2.0) jekyll (~> 3.3) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.13.2) - liquid (3.0.6) - listen (3.0.8) + jekyll-watch (2.1.2) + listen (~> 3.0) + kramdown (1.17.0) + liquid (4.0.1) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) - pathutil (0.14.0) + pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) - rouge (1.11.1) + public_suffix (3.0.3) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rouge (3.3.0) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.4.23) + sass (3.7.2) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) PLATFORMS ruby DEPENDENCIES - jekyll (= 3.4.0) + jekyll (>= 3.6.3) jekyll-feed (~> 0.6) - jekyll-livereload jekyll-sitemap tzinfo-data diff --git a/docker-compose.yml b/docker-compose.yml index 2d4b698..c304afb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ jekyll: image: jekyll/jekyll:latest - command: jekyll serve --livereload --reload_port 35729 + command: jekyll serve --livereload --livereload-port 35729 ports: - 4000:4000 - 35729:35729