From 4e2b21e02e5f63cbea1cd184aeeb3e579a9a1a4a Mon Sep 17 00:00:00 2001
From: mose <mose@mose.com>
Date: Wed, 11 Sep 2019 14:53:22 +0800
Subject: [PATCH] upate jekyll

---
 .gitignore         |  1 +
 Gemfile.lock       | 94 +++++++++++++++++++++++-----------------------
 docker-compose.yml |  2 +-
 3 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/.gitignore b/.gitignore
index 766276b..956d36e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ script/__pycache__/*.pyc
 script/common/__pycache__/*.pyc
 \.vscode/\.ropeproject/
 .vscode/*
+.jekyll-cache/
diff --git a/Gemfile.lock b/Gemfile.lock
index e13cf69..3bc43f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,91 +1,93 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1.1)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
-    font-awesome-sass (5.5.0.1)
+    ffi (1.11.1)
+    font-awesome-sass (5.9.0)
       sassc (>= 1.11)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    html-pipeline (2.9.1)
+    gemoji (3.0.1)
+    html-pipeline (2.12.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (4.0.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (>= 0.9.5, < 2)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-compose (0.8.0)
-      jekyll (~> 3.0)
+      terminal-table (~> 1.8)
+    jekyll-compose (0.11.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-watch (2.1.2)
+    jekyll-redirect-from (0.15.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (2.0.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-sitemap (1.3.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.1)
+    jemoji (0.11.1)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
-    json (2.1.0)
-    kramdown (1.17.0)
-    liquid (4.0.1)
+      jekyll (>= 3.0, < 5.0)
+    json (2.2.0)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
     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)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rake (12.3.1)
+    public_suffix (4.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (3.3.0)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.10.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    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)
-    sassc (2.0.0)
-      ffi (~> 1.9.6)
-      rake
+    safe_yaml (1.0.5)
+    sassc (2.2.0)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
+    zeitwerk (2.1.10)
 
 PLATFORMS
   ruby
@@ -103,4 +105,4 @@ DEPENDENCIES
   rouge
 
 BUNDLED WITH
-   1.17.1
+   1.17.3
diff --git a/docker-compose.yml b/docker-compose.yml
index f2540a8..a7f3e7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   jekyll:
     environment:
       - JEKYLL_ENV=docker
-    image: jekyll/jekyll:3.8.5
+    image: jekyll/jekyll:4.0.0
     volumes: 
       - ".:/srv/jekyll"
     ports: