From 601c405cc63740a1ea8dfd8a3c36eca01f52cb50 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Fri, 2 Oct 2026 23:26:55 +0200 Subject: [PATCH] Update dependencies and drop obsolete json pin Rails 8.1.4 is out and includes the ActiveSupport::JSON.decode fix for json 3.0 (rails/rails#58601), so the `json < 3.0` pin and its dependabot ignore rule are no longer needed. The pin was only ever needed for the root Gemfile, which targets Rails 8.1; the gemfiles/* Gemfiles never declared json. Also updates bundler to 4.0.22 and refreshes the transitive dependencies across all Gemfiles. --- .github/dependabot.yml | 2 - Gemfile | 1 - Gemfile.lock | 123 ++++++++++++++++----------------- gemfiles/rails_70/Gemfile.lock | 6 +- gemfiles/rails_71/Gemfile.lock | 8 +-- gemfiles/rails_72/Gemfile.lock | 8 +-- gemfiles/rails_80/Gemfile.lock | 8 +-- 7 files changed, 76 insertions(+), 80 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9cc8c96..073a6a3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,8 +19,6 @@ updates: - "*" multi-ecosystem-group: bundler ignore: - - dependency-name: json - versions: ">= 3.0.0" # TODO: remove when a Rails release includes rails/rails#58601 - dependency-name: parallel versions: ">= 2.0" # TODO: remove when dropping Ruby < 3.3 compatibility - package-ecosystem: bundler diff --git a/Gemfile b/Gemfile index 28166b6..a5fdc7c 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,6 @@ end group :rails do gem 'rails', '~> 8.1.0' - gem 'json', '< 3.0' # TODO: relax this constraint when rails/rails#58601 will be released gem 'rspec-rails' gem 'combustion' gem 'capybara' diff --git a/Gemfile.lock b/Gemfile.lock index 12e8a47..d484f40 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,29 +9,29 @@ GEM specs: action_text-trix (2.1.19) railties - actioncable (8.1.3.1) - actionpack (= 8.1.3.1) - activesupport (= 8.1.3.1) + actioncable (8.1.4) + actionpack (= 8.1.4) + activesupport (= 8.1.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.3.1) - actionpack (= 8.1.3.1) - activejob (= 8.1.3.1) - activerecord (= 8.1.3.1) - activestorage (= 8.1.3.1) - activesupport (= 8.1.3.1) + actionmailbox (8.1.4) + actionpack (= 8.1.4) + activejob (= 8.1.4) + activerecord (= 8.1.4) + activestorage (= 8.1.4) + activesupport (= 8.1.4) mail (>= 2.8.0) - actionmailer (8.1.3.1) - actionpack (= 8.1.3.1) - actionview (= 8.1.3.1) - activejob (= 8.1.3.1) - activesupport (= 8.1.3.1) + actionmailer (8.1.4) + actionpack (= 8.1.4) + actionview (= 8.1.4) + activejob (= 8.1.4) + activesupport (= 8.1.4) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.3.1) - actionview (= 8.1.3.1) - activesupport (= 8.1.3.1) + actionpack (8.1.4) + actionview (= 8.1.4) + activesupport (= 8.1.4) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -39,36 +39,36 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.3.1) + actiontext (8.1.4) action_text-trix (~> 2.1.15) - actionpack (= 8.1.3.1) - activerecord (= 8.1.3.1) - activestorage (= 8.1.3.1) - activesupport (= 8.1.3.1) + actionpack (= 8.1.4) + activerecord (= 8.1.4) + activestorage (= 8.1.4) + activesupport (= 8.1.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.3.1) - activesupport (= 8.1.3.1) + actionview (8.1.4) + activesupport (= 8.1.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (8.1.3.1) - activesupport (= 8.1.3.1) + activejob (8.1.4) + activesupport (= 8.1.4) globalid (>= 0.3.6) - activemodel (8.1.3.1) - activesupport (= 8.1.3.1) - activerecord (8.1.3.1) - activemodel (= 8.1.3.1) - activesupport (= 8.1.3.1) + activemodel (8.1.4) + activesupport (= 8.1.4) + activerecord (8.1.4) + activemodel (= 8.1.4) + activesupport (= 8.1.4) timeout (>= 0.4.0) - activestorage (8.1.3.1) - actionpack (= 8.1.3.1) - activejob (= 8.1.3.1) - activerecord (= 8.1.3.1) - activesupport (= 8.1.3.1) + activestorage (8.1.4) + actionpack (= 8.1.4) + activejob (= 8.1.4) + activerecord (= 8.1.4) + activesupport (= 8.1.4) marcel (~> 1.0) - activesupport (8.1.3.1) + activesupport (8.1.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -119,7 +119,7 @@ GEM prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.21.2) + json (3.0.2) language_server-protocol (3.17.0.6) lint_roller (1.1.0) logger (1.7.0) @@ -147,7 +147,7 @@ GEM net-protocol net-protocol (0.4.0) timeout - net-smtp (0.5.1) + net-smtp (0.5.2) net-protocol nio4r (2.7.5) nokogiri (1.19.4) @@ -183,20 +183,20 @@ GEM rack (>= 1.3) rackup (2.3.1) rack (>= 3) - rails (8.1.3.1) - actioncable (= 8.1.3.1) - actionmailbox (= 8.1.3.1) - actionmailer (= 8.1.3.1) - actionpack (= 8.1.3.1) - actiontext (= 8.1.3.1) - actionview (= 8.1.3.1) - activejob (= 8.1.3.1) - activemodel (= 8.1.3.1) - activerecord (= 8.1.3.1) - activestorage (= 8.1.3.1) - activesupport (= 8.1.3.1) + rails (8.1.4) + actioncable (= 8.1.4) + actionmailbox (= 8.1.4) + actionmailer (= 8.1.4) + actionpack (= 8.1.4) + actiontext (= 8.1.4) + actionview (= 8.1.4) + activejob (= 8.1.4) + activemodel (= 8.1.4) + activerecord (= 8.1.4) + activestorage (= 8.1.4) + activesupport (= 8.1.4) bundler (>= 1.15.0) - railties (= 8.1.3.1) + railties (= 8.1.4) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest @@ -204,9 +204,9 @@ GEM rails-html-sanitizer (1.7.1) loofah (~> 2.25, >= 2.25.2) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.1.3.1) - actionpack (= 8.1.3.1) - activesupport (= 8.1.3.1) + railties (8.1.4) + actionpack (= 8.1.4) + activesupport (= 8.1.4) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -219,12 +219,12 @@ GEM logger prism (>= 1.6.0) tsort - rdoc (8.0.0) + rdoc (8.1.0) erb prism (>= 1.6.0) rbs (>= 4.0.0) tsort - regexp_parser (2.12.0) + regexp_parser (2.13.1) reline (0.7.0) io-console (~> 0.5) rexml (3.4.4) @@ -288,9 +288,9 @@ GEM tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (3.2.0) - unicode-emoji (~> 4.1) - unicode-emoji (4.2.0) + unicode-display_width (3.3.0) + unicode-emoji (~> 4.3) + unicode-emoji (4.3.0) uri (1.1.1) useragent (0.16.11) websocket-driver (0.8.2) @@ -312,7 +312,6 @@ DEPENDENCIES arbre! capybara combustion - json (< 3.0) parallel (~> 1.28) pry rails (~> 8.1.0) @@ -328,4 +327,4 @@ DEPENDENCIES simplecov-cobertura BUNDLED WITH - 4.0.21 + 4.0.22 diff --git a/gemfiles/rails_70/Gemfile.lock b/gemfiles/rails_70/Gemfile.lock index 5af27bc..add0f98 100644 --- a/gemfiles/rails_70/Gemfile.lock +++ b/gemfiles/rails_70/Gemfile.lock @@ -137,7 +137,7 @@ GEM net-protocol net-protocol (0.4.0) timeout - net-smtp (0.5.1) + net-smtp (0.5.2) net-protocol nio4r (2.7.5) nokogiri (1.19.4) @@ -190,7 +190,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rake (13.4.2) - regexp_parser (2.12.0) + regexp_parser (2.13.1) reline (0.7.0) io-console (~> 0.5) rexml (3.4.4) @@ -252,4 +252,4 @@ DEPENDENCIES simplecov-cobertura BUNDLED WITH - 4.0.21 + 4.0.22 diff --git a/gemfiles/rails_71/Gemfile.lock b/gemfiles/rails_71/Gemfile.lock index c089406..12bf6aa 100644 --- a/gemfiles/rails_71/Gemfile.lock +++ b/gemfiles/rails_71/Gemfile.lock @@ -151,7 +151,7 @@ GEM net-protocol net-protocol (0.4.0) timeout - net-smtp (0.5.1) + net-smtp (0.5.2) net-protocol nio4r (2.7.5) nokogiri (1.19.4) @@ -219,12 +219,12 @@ GEM logger prism (>= 1.6.0) tsort - rdoc (8.0.0) + rdoc (8.1.0) erb prism (>= 1.6.0) rbs (>= 4.0.0) tsort - regexp_parser (2.12.0) + regexp_parser (2.13.1) reline (0.7.0) io-console (~> 0.5) rexml (3.4.4) @@ -287,4 +287,4 @@ DEPENDENCIES simplecov-cobertura BUNDLED WITH - 4.0.21 + 4.0.22 diff --git a/gemfiles/rails_72/Gemfile.lock b/gemfiles/rails_72/Gemfile.lock index abb5b97..0a243f9 100644 --- a/gemfiles/rails_72/Gemfile.lock +++ b/gemfiles/rails_72/Gemfile.lock @@ -142,7 +142,7 @@ GEM net-protocol net-protocol (0.4.0) timeout - net-smtp (0.5.1) + net-smtp (0.5.2) net-protocol nio4r (2.7.5) nokogiri (1.19.4) @@ -210,12 +210,12 @@ GEM logger prism (>= 1.6.0) tsort - rdoc (8.0.0) + rdoc (8.1.0) erb prism (>= 1.6.0) rbs (>= 4.0.0) tsort - regexp_parser (2.12.0) + regexp_parser (2.13.1) reline (0.7.0) io-console (~> 0.5) rexml (3.4.4) @@ -279,4 +279,4 @@ DEPENDENCIES simplecov-cobertura BUNDLED WITH - 4.0.21 + 4.0.22 diff --git a/gemfiles/rails_80/Gemfile.lock b/gemfiles/rails_80/Gemfile.lock index d23c87d..df72e3e 100644 --- a/gemfiles/rails_80/Gemfile.lock +++ b/gemfiles/rails_80/Gemfile.lock @@ -141,7 +141,7 @@ GEM net-protocol net-protocol (0.4.0) timeout - net-smtp (0.5.1) + net-smtp (0.5.2) net-protocol nio4r (2.7.5) nokogiri (1.19.4) @@ -208,12 +208,12 @@ GEM logger prism (>= 1.6.0) tsort - rdoc (8.0.0) + rdoc (8.1.0) erb prism (>= 1.6.0) rbs (>= 4.0.0) tsort - regexp_parser (2.12.0) + regexp_parser (2.13.1) reline (0.7.0) io-console (~> 0.5) rexml (3.4.4) @@ -278,4 +278,4 @@ DEPENDENCIES simplecov-cobertura BUNDLED WITH - 4.0.21 + 4.0.22