From 74acc362321d014f68c66d1d02018a6cae064307 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Tue, 4 Jan 2022 16:33:59 +0100 Subject: [PATCH] Move to middleman 4 --- Gemfile | 2 +- Gemfile.lock | 244 ++++++++++++++++++++++++--------------------------- 2 files changed, 117 insertions(+), 129 deletions(-) diff --git a/Gemfile b/Gemfile index a0ec840..58fac14 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' source 'https://rails-assets.org' -gem "middleman", "~> 3.3.3" +gem "middleman", "~> 4" gem "middleman-livereload" gem 'middleman-sprockets' diff --git a/Gemfile.lock b/Gemfile.lock index 10b6cdd..56ba4d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,185 +2,173 @@ GEM remote: http://rubygems.org/ remote: https://rails-assets.org/ specs: - activesupport (4.1.16) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - autoprefixer-rails (9.7.4) - execjs + activesupport (6.1.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + autoprefixer-rails (10.4.0.0) + execjs (~> 2) + backports (3.23.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - celluloid (0.16.0) - timers (~> 4.0.0) - chunky_png (1.3.11) - coderay (1.1.2) + coderay (1.1.3) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) + concurrent-ruby (1.1.9) + contracts (0.13.0) crass (1.0.6) - docile (1.3.2) - em-websocket (0.5.1) + docile (1.4.0) + dotenv (2.7.6) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) erubis (2.7.0) eventmachine (1.2.7) - execjs (2.7.0) + execjs (2.8.1) + fast_blank (1.0.1) + fastimage (2.2.6) favicon_maker (1.3.1) docile (~> 1.1) - feedjira (3.1.1) + feedjira (3.2.1) loofah (>= 2.3.1) sax-machine (>= 1.0) - ffi (1.12.2) - font-awesome-middleman (4.5.0) - middleman-core (~> 3.0) - haml (5.1.2) + ffi (1.15.4) + font-awesome-middleman (4.2.1) + middleman-core (>= 3.0.0) + haml (5.2.2) temple (>= 0.8.0) tilt - hike (1.2.3) - hitimes (2.0.0) - hooks (0.4.1) - uber (~> 0.0.14) - http_parser.rb (0.6.0) - i18n (0.7.0) - json (1.8.6) - kramdown (1.17.0) - libv8 (3.16.14.19) - listen (2.10.1) - celluloid (~> 0.16.0) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - loofah (2.4.0) + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.6.0) + http_parser.rb (0.8.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + kramdown (2.3.1) + rexml + libv8 (3.16.14.19-x86_64-linux) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - middleman (3.3.12) + memoist (0.16.2) + middleman (4.4.2) coffee-script (~> 2.2) - compass (>= 1.0.0, < 2.0.0) - compass-import-once (= 1.0.5) - execjs (~> 2.0) haml (>= 4.0.5) - kramdown (~> 1.2) - middleman-core (= 3.3.12) - middleman-sprockets (>= 3.1.2) - sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) - middleman-core (3.3.12) - activesupport (~> 4.1.0) - bundler (~> 1.1) + kramdown (>= 2.3.0) + middleman-cli (= 4.4.2) + middleman-core (= 4.4.2) + middleman-cli (4.4.2) + thor (>= 0.17.0, < 2.0) + middleman-core (4.4.2) + activesupport (>= 6.1, < 7.0) + addressable (~> 2.4) + backports (~> 3.6) + bundler (~> 2.0) + contracts (~> 0.13.0) + dotenv erubis - hooks (~> 0.3) - i18n (~> 0.7.0) - listen (>= 2.7.9, < 3.0) - padrino-helpers (~> 0.12.3) - rack (>= 1.4.5, < 2.0) - rack-test (~> 0.6.2) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) + i18n (~> 1.6.0) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.15.0) + parallel + rack (>= 1.4.5, < 3) + sassc (~> 2.0) + servolux + tilt (~> 2.0.9) + toml + uglifier (~> 3.0) + webrick middleman-deploy (1.0.0) middleman-core (>= 3.2) net-sftp ptools - middleman-favicon-maker (3.7) - favicon_maker (~> 1.3) - middleman-core (>= 3.0.0) - middleman-livereload (3.4.6) + middleman-favicon-maker (4.1.0) + favicon_maker (~> 1.3, >= 1.3.1) + middleman-core (~> 4.0) + middleman-livereload (3.4.7) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-sprockets (3.5.0) - middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) + middleman-sprockets (4.1.1) + middleman-core (~> 4.0) + sprockets (>= 3.0) middleman-syntax (3.2.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_portile2 (2.6.1) - minitest (5.14.0) - multi_json (1.14.1) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (5.2.0) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + minitest (5.15.0) + net-sftp (3.0.0) + net-ssh (>= 5.0.0, < 7.0.0) + net-ssh (6.1.0) + nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) - oj (3.10.5) - open-uri-cached (0.0.5) - padrino-helpers (0.12.9) - i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.9) + oj (3.13.10) + open-uri-cached (1.0.0) + padrino-helpers (0.15.1) + i18n (>= 0.6.7, < 2) + padrino-support (= 0.15.1) tilt (>= 1.4.1, < 3) - padrino-support (0.12.9) - activesupport (>= 3.1) - ptools (1.3.5) + padrino-support (0.15.1) + parallel (1.21.0) + parslet (2.0.0) + ptools (1.4.2) + public_suffix (4.0.6) racc (1.6.0) - rack (1.6.13) + rack (2.2.3) rack-livereload (0.3.17) rack - rack-test (0.6.3) - rack (>= 1.0) rails-assets-jquery (1.12.4) - rb-fsevent (0.10.3) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) - rouge (3.16.0) + rexml (3.2.5) + rouge (3.27.0) ruby18_source_location (0.2) - sanitize (5.2.1) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) - sass (3.4.25) - sassc (2.2.1) + nokogiri (>= 1.12.0) + sassc (2.4.0) ffi (~> 1.9) sax-machine (1.3.2) - sprockets (2.12.5) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) + servolux (0.13.0) + sprockets (4.0.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) stringex (2.8.5) temple (0.8.2) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (1.0.1) - thread_safe (0.3.6) - tilt (1.4.1) - timers (4.0.4) - hitimes - tzinfo (1.2.6) - thread_safe (~> 0.1) - uber (0.0.15) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + thor (1.1.0) + tilt (2.0.10) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + webrick (1.7.0) + zeitwerk (2.5.3) PLATFORMS - ruby + x86_64-linux DEPENDENCIES bootstrap-sass @@ -189,7 +177,7 @@ DEPENDENCIES feedjira font-awesome-middleman kramdown - middleman (~> 3.3.3) + middleman (~> 4) middleman-deploy middleman-favicon-maker middleman-livereload @@ -206,4 +194,4 @@ DEPENDENCIES wdm (~> 0.1.0) BUNDLED WITH - 1.17.2 + 2.2.22