From 390ceca9641912f44da3c6ae618baa4fe8a7d468 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Sun, 16 Feb 2025 00:09:48 +0000 Subject: [PATCH] Fix middleman gem dependencies --- Gemfile | 8 +++ Gemfile.lock | 151 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 101 insertions(+), 58 deletions(-) diff --git a/Gemfile b/Gemfile index 886d7be40..c9f7a9bad 100644 --- a/Gemfile +++ b/Gemfile @@ -20,3 +20,11 @@ gem "rack-contrib" # For try_static # For testing purposes gem "nokogiri" gem "httparty" +# +# pin for logger issue +gem 'concurrent-ruby', '1.3.4' + +# gems for Ruby 3.4 support +gem 'base64' +gem 'bigdecimal' +gem 'mutex_m' diff --git a/Gemfile.lock b/Gemfile.lock index cd9846462..3fab43243 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,74 +1,85 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.6) + activesupport (7.0.8.7) 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) - backports (3.23.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + backports (3.25.0) + base64 (0.2.0) + bigdecimal (3.1.9) bourbon (4.2.2) sass (~> 3.4) thor - builder (3.2.4) + builder (3.3.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.2) - contracts (0.13.0) - docile (1.4.0) - dotenv (2.7.6) + concurrent-ruby (1.3.4) + contracts (0.16.1) + csv (3.3.2) + docile (1.4.1) + dotenv (3.1.7) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) erubis (2.7.0) eventmachine (1.2.7) - execjs (2.8.1) + execjs (2.10.0) fast_blank (1.0.1) - fastimage (2.2.6) + fastimage (2.4.0) favicon_maker (1.3.1) docile (~> 1.1) - ffi (1.17.0) - haml (5.2.2) - temple (>= 0.8.0) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt hamster (3.0.0) concurrent-ruby (~> 1.0) hashie (3.6.0) http_parser.rb (0.8.0) - httparty (0.21.0) + httparty (0.22.0) + csv mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) i18n (1.6.0) concurrent-ruby (~> 1.0) - kramdown (2.4.0) - rexml - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + kramdown (2.5.1) + rexml (>= 3.3.9) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) memoist (0.16.2) - middleman (4.4.2) + middleman (4.5.1) coffee-script (~> 2.2) haml (>= 4.0.5) kramdown (>= 2.3.0) - middleman-cli (= 4.4.2) - middleman-core (= 4.4.2) + middleman-cli (= 4.5.1) + middleman-core (= 4.5.1) middleman-blog (4.0.3) addressable (~> 2.3) middleman-core (>= 4.0.0) tzinfo (>= 0.3.0) - middleman-cli (4.4.2) - thor (>= 0.17.0, < 2.0) - middleman-core (4.4.2) - activesupport (>= 6.1, < 7.0) + middleman-cli (4.5.1) + thor (>= 0.17.0, < 1.3.0) + middleman-core (4.5.1) + activesupport (>= 6.1, < 7.1) addressable (~> 2.4) backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13.0) + contracts (~> 0.13, < 0.17) dotenv erubis execjs (~> 2.0) @@ -77,7 +88,7 @@ GEM hamster (~> 3.0) hashie (~> 3.4) i18n (~> 1.6.0) - listen (~> 3.0.0) + listen (~> 3.0) memoist (~> 0.14) padrino-helpers (~> 0.15.0) parallel @@ -95,39 +106,53 @@ GEM em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-syntax (3.2.0) + middleman-syntax (3.4.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_mime (1.1.2) - mini_portile2 (2.8.6) - minitest (5.19.0) - multi_xml (0.6.0) + mini_mime (1.1.5) + minitest (5.25.4) + multi_xml (0.7.1) + bigdecimal (~> 3.1) + mutex_m (0.3.0) neat (1.7.2) bourbon (>= 4.0) sass (>= 3.3) - nokogiri (1.16.5) - mini_portile2 (~> 2.8.2) + nokogiri (1.18.2-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-musl) racc (~> 1.4) - padrino-helpers (0.15.1) + padrino-helpers (0.15.3) i18n (>= 0.6.7, < 2) - padrino-support (= 0.15.1) + padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) - padrino-support (0.15.1) - parallel (1.22.1) + padrino-support (0.15.3) + parallel (1.26.3) parslet (2.0.0) - public_suffix (4.0.7) - racc (1.7.3) - rack (2.2.9) + public_suffix (6.0.1) + racc (1.8.1) + rack (2.2.11) rack-contrib (2.5.0) rack (< 4) rack-livereload (0.3.17) rack - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) redcarpet (3.6.0) - rexml (3.3.9) - rouge (3.28.0) + rexml (3.4.0) + rouge (3.30.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -136,33 +161,43 @@ GEM sassc (2.4.0) ffi (~> 1.9) servolux (0.13.0) - slim (4.1.0) - temple (>= 0.7.6, < 0.9) - tilt (>= 2.0.6, < 2.1) - temple (0.8.2) - thor (1.2.1) - tilt (2.0.10) + slim (5.1.0) + temple (~> 0.10.0) + tilt (>= 2.0.6, < 2.2) + temple (0.10.3) + thor (1.2.2) + tilt (2.0.11) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - webrick (1.8.2) - zeitwerk (2.6.11) + webrick (1.9.1) PLATFORMS - ruby + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES + base64 + bigdecimal bourbon (= 4.2.2) builder (~> 3.0) + concurrent-ruby (= 1.3.4) httparty middleman (~> 4.3) middleman-blog middleman-favicon-maker middleman-livereload middleman-syntax + mutex_m neat (= 1.7.2) nokogiri rack-contrib @@ -171,4 +206,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.3.3 + 2.6.2