upgrade to Jekyll 4jekyll4

The jekyll-github-metadata bug has finally been fixed.

7 files changed, 42 insertions, 47 deletions

diff --git a/.gitignore b/.gitignore
index 1e06029..0eae378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+/.jekyll-cache/
 _site/
 .wget/
diff --git a/Gemfile b/Gemfile
index cd316df..af4984b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,7 @@
 source 'https://rubygems.org'
-gem 'jekyll', '~> 3'
+gem 'jekyll', '~> 4'
 
 gem 'jekyll-github-metadata'
 gem 'jekyll-paginate'
 gem 'jekyll-remote-theme'
 gem 'jekyll-tidy'
-
-# Jekyll 3.9.0 requires this as an explicit dependency:
-gem 'kramdown-parser-gfm'
-
-# Jekyll 3.9.2 requires this as an explicit dependency for Ruby 3:
-gem 'webrick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c14759..c1fcf71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,49 +1,54 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (2.6.0)
+    faraday (2.7.6)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.1)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
+    google-protobuf (3.23.2-arm64-darwin)
+    google-protobuf (3.23.2-x86_64-linux)
     htmlbeautifier (1.4.2)
     htmlcompressor (0.4.0)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.2)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-github-metadata (2.15.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-github-metadata (2.16.0)
       jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
+      octokit (>= 4, < 7, != 4.4.0)
     jekyll-paginate (1.1.0)
     jekyll-remote-theme (0.4.3)
       addressable (~> 2.0)
       jekyll (>= 3.5, < 5.0)
       jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
       rubyzip (>= 1.3.0, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-tidy (0.2.2)
       htmlbeautifier
       htmlcompressor
@@ -54,46 +59,47 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    octokit (4.25.1)
+    mercenary (0.4.0)
+    octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
+    rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.30.0)
+    rouge (4.1.2)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-embedded (1.62.1)
+      google-protobuf (~> 3.21)
+      rake (>= 10.0.0)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    webrick (1.7.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
-  jekyll (~> 3)
+  jekyll (~> 4)
   jekyll-github-metadata
   jekyll-paginate
   jekyll-remote-theme
   jekyll-tidy
-  kramdown-parser-gfm
-  webrick
 
 BUNDLED WITH
    2.3.23
diff --git a/_config.yml b/_config.yml
index 229018d..e0179d1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,16 +6,13 @@ show_drafts: true
 strict_front_matter: true
 
 exclude:
-  - Gemfile
-  - Gemfile.lock
   - Makefile
   - README.md
-  - vendor/
 
 collections:
   notes:
     output: true
-    # Jekyll 4.0 or later:
+    # I want the "natural" sorting (a.k.a. whatever the sort_natural filter does).
     #sort_by: title
 
 defaults:
@@ -58,7 +55,7 @@ repository: egor-tensin/blog
 # jekyll-paginate
 paginate: 100
 # jekyll-remote-theme
-remote_theme: egor-tensin/jekyll-theme@6c88a165e81877a9e56ede789c07e3e0d2e05601
+remote_theme: egor-tensin/jekyll-theme@4ccad582f01cbfe19956fc6bfe589e599e7e85d3
 
 # Theme settings
 settings:
diff --git a/_includes/notes.html b/_includes/notes.html
index 54055d7..ca91e54 100644
--- a/_includes/notes.html
+++ b/_includes/notes.html
@@ -1,6 +1,3 @@
-{% comment %}
-  Sorting can be done in _config.yml with Jekyll 4.0 or later.
-{% endcomment %}
 {% assign note_list = site.notes | sort_natural: 'title' %}
 <div class="list-group wide-enough">
   <div class="list-group-item disabled">
diff --git a/_notes/makefile.md b/_notes/makefile.md
index b35aea2..62e0570 100644
--- a/_notes/makefile.md
+++ b/_notes/makefile.md
@@ -95,7 +95,7 @@ features:
 I've made a [detailed blog post] about how all of this works.
 {: .alert .alert-info }
 
-[detailed blog post]: {{ site.baseurl }}{% post_url 2020-05-20-makefile-escaping %}
+[detailed blog post]: {% post_url 2020-05-20-makefile-escaping %}
 
 {% for feature in page.features %}
   {{ feature.note | markdownify }}
diff --git a/_posts/2020-05-20-makefile-escaping.md b/_posts/2020-05-20-makefile-escaping.md
index dd9125a..d468cc3 100644
--- a/_posts/2020-05-20-makefile-escaping.md
+++ b/_posts/2020-05-20-makefile-escaping.md
@@ -4,7 +4,7 @@ title: Escaping characters in Makefile
 TL;DR: visit [this page] for a short and concise version of this article.
 {: .alert .alert-success }
 
-[this page]: {{ site.baseurl }}{% link _notes/makefile.md %}
+[this page]: {% link _notes/makefile.md %}
 
 I'm a big sucker for irrelevant nitpicks like properly quoting arguments in
 shell scripts.