From 820a0cb7a2d2fba1fb9e7b6ec8f75fd7e38839b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 2 Jan 2025 17:18:53 +0100 Subject: [PATCH 1/4] Use Ruby 3.4.1 --- .ruby-version | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 9c25013dbb..47b322c971 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.6 +3.4.1 diff --git a/Gemfile.lock b/Gemfile.lock index 74b7c31a98..daefa1456e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -261,7 +261,7 @@ DEPENDENCIES rubocop-rake RUBY VERSION - ruby 3.3.6p108 + ruby 3.4.1p0 BUNDLED WITH 2.6.1 From 106d11574cf1a735e68185384a1b163cdb1557f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 2 Jan 2025 17:19:27 +0100 Subject: [PATCH 2/4] Use bundler 2.6.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index daefa1456e..2ed4af9493 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,4 +264,4 @@ RUBY VERSION ruby 3.4.1p0 BUNDLED WITH - 2.6.1 + 2.6.2 From 28cb51acfad9402adf770081ed5d7d007cdac5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 2 Jan 2025 17:20:23 +0100 Subject: [PATCH 3/4] Use more generic arm64-darwin in lockfile --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2ed4af9493..5ae68d7377 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,7 +237,7 @@ GEM webrick (1.8.2) PLATFORMS - arm64-darwin-21 + arm64-darwin ruby x86_64-linux From c2b15bc4d3d37134dce7ddb93c09aa47c52da9c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 19 Dec 2024 17:50:29 +0100 Subject: [PATCH 4/4] Use middleman from the main branch The 5.x branch is abandoned, and main should have everything we need now. --- Gemfile | 3 +- Gemfile.lock | 126 ++++++++++++++++++++++++--------------------------- 2 files changed, 61 insertions(+), 68 deletions(-) diff --git a/Gemfile b/Gemfile index 40351d3b80..1b2da270ca 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,7 @@ source "https://rubygems.org" ruby File.read(File.expand_path("../.ruby-version", __FILE__)).strip # Static site generator -## Includes https://github.com/middleman/middleman/pull/2565, https://github.com/middleman/middleman/pull/2571, https://github.com/middleman/middleman/pull/2588 -gem "middleman", github: "middleman/middleman", ref: "50f76c2984c4f82b243b0a5e3f860aeaf63e07d5" +gem "middleman", github: "middleman/middleman" ## Extensions gem "middleman-blog" gem "middleman-search", github: "tnir/middleman-search", branch: "edge" # https://github.com/manastech/middleman-search/pull/39 diff --git a/Gemfile.lock b/Gemfile.lock index 5ae68d7377..ff39341b13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,38 @@ GIT remote: https://github.com/middleman/middleman.git - revision: 50f76c2984c4f82b243b0a5e3f860aeaf63e07d5 - ref: 50f76c2984c4f82b243b0a5e3f860aeaf63e07d5 + revision: ee4460a59cb36d2b7b814f90da6c8585e4af8d3d specs: - middleman (5.0.0.rc.2) - coffee-script (~> 2.4) - haml (>= 4.0.5) - kramdown (~> 2.3) - middleman-cli (= 5.0.0.rc.2) - middleman-core (= 5.0.0.rc.2) - webrick (~> 1.7) - middleman-cli (5.0.0.rc.2) - thor (>= 0.17.0, < 2.0) - middleman-core (5.0.0.rc.2) - activesupport (>= 5.0.0) - addressable (~> 2) - bundler - contracts (~> 0.17) + middleman (4.5.1) + middleman-cli (= 4.5.1) + middleman-core (= 4.5.1) + middleman-cli (4.5.1) + thor (>= 0.17.0, < 1.3.0) + middleman-core (4.5.1) + activesupport (>= 6.1) + addressable (~> 2.4) + bundler (~> 2.0) + coffee-script (~> 2.2) + contracts dotenv - erubis - execjs (~> 2) - fastimage (~> 2) - hamster (~> 3) - hashie (~> 5) - i18n (~> 1) - listen (~> 3) - memoist (~> 0) - oj (~> 3) + erubi + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + haml (>= 4.0.5) + hamster (~> 3.0) + hashie (>= 3.4, < 6.0) + i18n (>= 1.6, < 1.15) + kramdown (~> 2.4) + listen (~> 3.0) + memoist (~> 0.14) padrino-helpers (~> 0.15.0) parallel - rack (>= 1.4.5, < 3) - rgl (~> 0.5) - sassc (~> 2) + rack (>= 1.4.5, < 4) + sassc (~> 2.0) servolux - terser (~> 1.1) - tilt (~> 2.0.9) + tilt (~> 2.0) toml + uglifier (>= 3, < 5) webrick GIT @@ -51,21 +48,25 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3) + activesupport (8.0.1) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.6) + benchmark (0.4.0) + bigdecimal (3.1.9) builder (3.3.0) byebug (11.1.3) coderay (1.1.3) @@ -73,14 +74,13 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - contracts (0.17) + contracts (0.17.2) date (3.4.1) - dotenv (2.8.1) - drb (2.2.0) - ruby2_keywords - erubis (2.7.0) + dotenv (3.1.7) + drb (2.2.1) + erubi (1.13.1) execjs (2.9.1) faraday (2.12.0) faraday-net_http (>= 2.0, < 3.4) @@ -90,8 +90,11 @@ GEM net-http faraday-retry (2.2.1) faraday (~> 2.0) - fastimage (2.3.0) - ffi (1.16.3) + fast_blank (1.0.1) + fastimage (2.3.1) + ffi (1.17.1) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-linux-gnu) haml (5.2.2) temple (>= 0.8.0) tilt @@ -104,7 +107,7 @@ GEM hamster (3.0.0) concurrent-ruby (~> 1.0) hashie (5.0.0) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) io-console (0.8.0) irb (1.14.3) @@ -119,10 +122,10 @@ GEM libv8-node (18.16.0.0) libv8-node (18.16.0.0-arm64-darwin) libv8-node (18.16.0.0-x86_64-linux) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.1) + logger (1.6.4) memoist (0.16.2) method_source (1.0.0) middleman-blog (4.0.3) @@ -135,9 +138,8 @@ GEM mini_portile2 (2.8.8) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) - minitest (5.21.2) + minitest (5.25.4) mustache (1.1.1) - mutex_m (0.2.0) net-http (0.4.1) uri nokogiri (1.18.1) @@ -155,14 +157,11 @@ GEM octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) - oj (3.16.3) - bigdecimal (>= 3.0) padrino-helpers (0.15.3) i18n (>= 0.6.7, < 2) padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) padrino-support (0.15.3) - pairing_heap (3.0.1) parallel (1.26.3) parser (3.3.6.0) ast (~> 2.4.1) @@ -179,22 +178,18 @@ GEM stringio public_suffix (6.0.1) racc (1.8.1) - rack (2.2.8.1) + rack (2.2.10) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rdoc (6.10.0) psych (>= 4.0.0) regexp_parser (2.9.3) reline (0.6.0) io-console (~> 0.5) - rexml (3.3.9) - rgl (0.6.6) - pairing_heap (>= 0.3, < 4.0) - rexml (~> 3.2, >= 3.2.4) - stream (~> 0.5.3) + rexml (3.4.0) rouge (3.30.0) rubocop (1.69.2) json (~> 2.3) @@ -211,30 +206,29 @@ GEM rubocop-rake (0.6.0) rubocop (~> 1.0) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) + securerandom (0.4.1) servolux (0.13.0) - stream (0.5.5) stringio (3.1.2) sysexits (1.2.0) temple (0.10.3) - terser (1.1.20) - execjs (>= 0.3.0, < 3) - thor (1.2.1) - tilt (2.0.11) + thor (1.2.2) + tilt (2.5.0) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + uglifier (4.2.1) + execjs (>= 0.3.0, < 3) unicode-display_width (3.1.2) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) - uri (0.13.1) - webrick (1.8.2) + uri (1.0.2) + webrick (1.9.1) PLATFORMS arm64-darwin