Updated to Jekyll 4.1

Signed-off-by: Jim Martens <github@2martens.de>

Gemfile

@@ -5,12 +5,12 @@ gem "actionview", ">= 5.2.4.2"
 gem 'mini_racer'
 # gem 'github-pages-health-check'
 gem 'html-proofer', group: :development
-gem 'jekyll', '~> 3.8.5'
+gem 'jekyll', '~> 4.1'
 group :jekyll_plugins do
   gem 'jekyll-avatar'
   gem 'jekyll-coffeescript'
   gem 'jekyll-commonmark-ghpages'
-  gem 'jekyll-default-layout'
+  gem 'jekyll-default-layout', git: 'https://github.com/benbalter/jekyll-default-layout'
   gem 'jekyll-feed'
   gem 'jekyll-gist'
   gem 'jekyll-github-metadata'
@@ -28,20 +28,6 @@ group :jekyll_plugins do
   gem 'jemoji'
 end
 # themes
-gem 'jekyll-swiss'
-gem 'jekyll-theme-architect'
-gem 'jekyll-theme-cayman'
-gem 'jekyll-theme-dinky'
-gem 'jekyll-theme-hacker'
-gem 'jekyll-theme-leap-day'
-gem 'jekyll-theme-merlot'
-gem 'jekyll-theme-midnight'
-gem 'jekyll-theme-minimal'
-gem 'jekyll-theme-modernist'
-gem 'jekyll-theme-primer'
-gem 'jekyll-theme-slate'
-gem 'jekyll-theme-tactile'
-gem 'jekyll-theme-time-machine'
 gem 'minima'
 # end themes
 gem 'kramdown'

Gemfile.lock

@@ -1,20 +1,27 @@
+GIT
+  remote: https://github.com/benbalter/jekyll-default-layout
+  revision: 11054b8af659382223d9afe0a26f1627869a6abb
+  specs:
+    jekyll-default-layout (0.1.4)
+      jekyll (>= 3.0, < 5.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.1)
+    actionpack (6.0.3.2)
-      actionview (= 6.0.3.1)
+      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.1)
+      activesupport (= 6.0.3.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.1)
+    actionview (6.0.3.2)
-      activesupport (= 6.0.3.1)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -22,7 +29,7 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
+    ast (2.4.1)
     builder (3.2.4)
     coffee-script (2.4.1)
       coffee-script-source
@@ -43,10 +50,10 @@ GEM
     execjs (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    html-pipeline (2.12.3)
+    html-pipeline (2.13.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     html-proofer (3.15.3)
@@ -58,21 +65,23 @@ GEM
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.7)
+    jekyll (4.1.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
+      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)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
+      terminal-table (~> 1.8)
     jekyll-avatar (0.7.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-coffeescript (2.0.0)
@@ -85,9 +94,7 @@ GEM
       commonmarker (~> 0.17.6)
       jekyll-commonmark (~> 1.2)
       rouge (>= 2.0, < 4.0)
-    jekyll-default-layout (0.1.4)
+    jekyll-feed (0.14.0)
-      jekyll (~> 3.0)
-    jekyll-feed (0.13.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
@@ -108,53 +115,12 @@ GEM
       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)
+    jekyll-sass-converter (2.1.0)
-      sass (~> 3.4)
+      sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.6.1)
       jekyll (>= 3.3, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.4)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.3)
       jekyll (>= 3.3, < 5.0)
     jekyll-toc (0.14.0)
@@ -166,19 +132,22 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (1.17.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     libv8 (7.3.492.27.1)
     liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.10)
+    mini_racer (0.2.15)
       libv8 (> 7.3)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
@@ -193,9 +162,9 @@ GEM
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.19.1)
+    parallel (1.19.2)
-    parser (2.7.1.2)
+    parser (2.7.1.4)
-      ast (~> 2.4.0)
+      ast (~> 2.4.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.5)
@@ -207,9 +176,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.1)
+    railties (6.0.3.2)
-      actionpack (= 6.0.3.1)
+      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.1)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -218,25 +187,27 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
-    rouge (3.18.0)
+    rouge (3.20.0)
-    rubocop (0.83.0)
+    rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
     ruby-enum (0.8.0)
       i18n
     ruby-progressbar (1.10.1)
     rubyzip (1.3.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
+    sassc (2.4.0)
-      sass-listen (~> 4.0.0)
+      ffi (~> 1.9)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -250,7 +221,7 @@ GEM
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
     yell (2.2.2)
-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby
@@ -259,11 +230,11 @@ DEPENDENCIES
   actionview (>= 5.2.4.2)
   activesupport
   html-proofer
-  jekyll (~> 3.8.5)
+  jekyll (~> 4.1)
   jekyll-avatar
   jekyll-coffeescript
   jekyll-commonmark-ghpages
-  jekyll-default-layout
+  jekyll-default-layout!
   jekyll-feed
   jekyll-gist
   jekyll-github-metadata
@@ -275,20 +246,6 @@ DEPENDENCIES
   jekyll-remote-theme
   jekyll-seo-tag
   jekyll-sitemap
-  jekyll-swiss
-  jekyll-theme-architect
-  jekyll-theme-cayman
-  jekyll-theme-dinky
-  jekyll-theme-hacker
-  jekyll-theme-leap-day
-  jekyll-theme-merlot
-  jekyll-theme-midnight
-  jekyll-theme-minimal
-  jekyll-theme-modernist
-  jekyll-theme-primer
-  jekyll-theme-slate
-  jekyll-theme-tactile
-  jekyll-theme-time-machine
   jekyll-titles-from-headings
   jekyll-toc
   jemoji

_includes/head.html

@@ -143,7 +143,7 @@
 
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
     <link rel="alternate" type="application/rss+xml" title="{{ site.title }}"
-          href="{{ site.baseurl }}{% link feed.xml %}">
+          href="{% link feed.xml %}">
     <link rel="mask-icon" href="{{ site.data.author.brand_logo_mask }}" sizes="any" color="#323232">
     <link rel="shortcut icon" href="{{ site.data.author.brand_logo_png150 }}" type="image/png" sizes="150x150">
     <link rel="apple-touch-icon" sizes="150x150" href="{{ site.data.author.brand_logo_png150 }}">

_posts/2017-09-25-politischer-werdegang.markdown

@@ -199,7 +199,7 @@ Ich schloss meine Rede mit:
 > fear, hope. Against austerity, prosperity. Against corruption, transparency. 
 > United we stand, divided we fall. Fight for and vote green in 2017. #votegreen17
 
-[1]: {{ site.baseurl }}{% link _posts/2017-06-18-bdk-rede.markdown %}
+[1]: {% link _posts/2017-06-18-bdk-rede.markdown %}
 
 ## Bundestagswahlkampf
 

_posts/2017-12-27-2martens-relaunch.markdown

@@ -34,7 +34,7 @@ of September and early December (see [Jahresabschluss 2017][0]). That way the re
 of the website would in addition to the mere technical aspects also resemble the
 renewed spirit in my life.
 
-[0]: {{ site.baseurl }}{% link _posts/2017-12-15-jahresabschluss.markdown %}
+[0]: {% link _posts/2017-12-15-jahresabschluss.markdown %}
 
 ## Planning
 

_posts/2018-01-10-bewerbung-bdk-delegierter.markdown

@@ -38,7 +38,7 @@ zu können (siehe [BDK-Rede]). Ende September 2017 wurde ich dann für alle BDKe
 delegiert. Zu dem Zeitpunkt war die nächste BDK noch im Oktober geplant und es hätte über
 die Aufnahme von Koalitionsverhandlungen entschieden werden müssen. Bekanntlich kam es anders.
 
-[BDK-Rede]: {{ site.baseurl }}{% link _posts/2017-06-18-bdk-rede.markdown %} 
+[BDK-Rede]: {% link _posts/2017-06-18-bdk-rede.markdown %} 
 
 Jetzt geht es also um die Wahl des neuen Bundesvorstands. Dies ist eine wegweisende Entscheidung,
 es geht um nicht weniger als die Zukunftsfähigkeit der Partei. Bevor ich mich jedoch dazu äußere,

pages/about.html

@@ -57,7 +57,7 @@ description: Here you can find meta information about this website.
 
 <p>
     Furthermore I created a page about the
-    <a href="{{ site.baseurl }}{% link pages/snowden-refugees.html %}">Snowden refugees</a> which lists ways in which
+    <a href="{% link pages/snowden-refugees.html %}">Snowden refugees</a> which lists ways in which
     you can help them.
 </p>
 

pages/datenschutzerklärung.html

@@ -4,7 +4,7 @@ permalink: /datenschutz/
 description: Die Datenschutzerklärung für diese Website kann hier gefunden werden.
 ---
 
-For your convenience there is an <a href="{{ site.baseurl }}{% link pages/privacy-policy.html %}">English version</a> available.
+For your convenience there is an <a href="{% link pages/privacy-policy.html %}">English version</a> available.
 
 <h2>1. Datenschutz auf einen Blick</h2>
 <h3>Allgemeine Hinweise</h3>

pages/impressum.html

@@ -4,7 +4,7 @@ permalink: /impressum/
 description: Das Impressum für diese Website kann hier gefunden werden.
 ---
 
-For your convenience there is an <a href="{{ site.baseurl }}{% link pages/legal-notice.html %}">English version</a> available.
+For your convenience there is an <a href="{% link pages/legal-notice.html %}">English version</a> available.
 
 <h2>Angaben gemäß § 5 TMG:</h2>
 <p>Jim Richard Martens<br />