From 80b68e7003f4e6034ddffde4cbc8bc51c9e1b6f4 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Tue, 8 Sep 2026 14:00:59 +0200 Subject: [PATCH] Allow JSON 3 on newer Rubies Remove the global JSON 2 constraint now that multi_json 1.21.2 supports JSON 3. Keep the constraint in Rails 7 appraisals because those still test Ruby 3.0 and 3.1, while multi_json 1.21.2 requires Ruby 3.2. --- Appraisals | 5 +++++ Gemfile | 1 - gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.2.gemfile | 2 +- gemfiles/rails_8.0.gemfile | 1 - gemfiles/rails_8.1.gemfile | 1 - gemfiles/rails_edge.gemfile | 1 - 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Appraisals b/Appraisals index f87d5654..15fcc15b 100644 --- a/Appraisals +++ b/Appraisals @@ -4,14 +4,19 @@ appraise 'rails-7.0' do gem 'rails', '~> 7.0.0' gem 'concurrent-ruby', '1.3.4' # Ref: rails/rails#54260 + gem 'json', '< 3' # multi_json 1.21+ requires Ruby >= 3.2 end appraise 'rails-7.1' do gem 'rails', '~> 7.1.0' + + gem 'json', '< 3' # multi_json 1.21+ requires Ruby >= 3.2 end appraise 'rails-7.2' do gem 'rails', '~> 7.2.0' + + gem 'json', '< 3' # multi_json 1.21+ requires Ruby >= 3.2 end appraise 'rails-8.0' do diff --git a/Gemfile b/Gemfile index 8489a28f..2900db5b 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ gem 'aruba' gem 'bundler' gem 'byebug' gem 'hirb' -gem 'json', '< 3' # TODO: Remove when a multi_json-compatible version is released. gem 'pry' gem 'rails' gem 'rake' diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 26eb64e4..8ccaf098 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -7,7 +7,6 @@ gem "aruba" gem "bundler" gem "byebug" gem "hirb" -gem "json", "< 3" gem "pry" gem "rails", "~> 7.0.0" gem "rake" @@ -20,5 +19,6 @@ gem "rubocop-rails", :require => false gem "rubocop-rake", :require => false gem "rubocop-rspec", :require => false gem "concurrent-ruby", "1.3.4" +gem "json", "< 3" gemspec :path => "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 955ec76b..346cb8ef 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -7,7 +7,6 @@ gem "aruba" gem "bundler" gem "byebug" gem "hirb" -gem "json", "< 3" gem "pry" gem "rails", "~> 7.1.0" gem "rake" @@ -19,5 +18,6 @@ gem "rubocop-performance", :require => false gem "rubocop-rails", :require => false gem "rubocop-rake", :require => false gem "rubocop-rspec", :require => false +gem "json", "< 3" gemspec :path => "../" diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index 56b5f1f5..763081d8 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -7,7 +7,6 @@ gem "aruba" gem "bundler" gem "byebug" gem "hirb" -gem "json", "< 3" gem "pry" gem "rails", "~> 7.2.0" gem "rake" @@ -19,5 +18,6 @@ gem "rubocop-performance", :require => false gem "rubocop-rails", :require => false gem "rubocop-rake", :require => false gem "rubocop-rspec", :require => false +gem "json", "< 3" gemspec :path => "../" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index 4509eb2b..7ceccb98 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -7,7 +7,6 @@ gem "aruba" gem "bundler" gem "byebug" gem "hirb" -gem "json", "< 3" gem "pry" gem "rails", "~> 8.0.0" gem "rake" diff --git a/gemfiles/rails_8.1.gemfile b/gemfiles/rails_8.1.gemfile index ed375a54..dd42fbf1 100644 --- a/gemfiles/rails_8.1.gemfile +++ b/gemfiles/rails_8.1.gemfile @@ -7,7 +7,6 @@ gem "aruba" gem "bundler" gem "byebug" gem "hirb" -gem "json", "< 3" gem "pry" gem "rails", "~> 8.1.0" gem "rake" diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index 4488cbfb..beeaf0b6 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -7,7 +7,6 @@ gem "aruba" gem "bundler" gem "byebug" gem "hirb" -gem "json", "< 3" gem "pry" gem "rails", :git => "https://github.com/rails/rails.git", :branch => "main" gem "rake"