From 40d3466d53d98a9e5449e1cbe22ee16892a18ea0 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Wed, 19 Feb 2025 14:38:24 -0800 Subject: [PATCH 1/3] Remove old Rails < 7 gemfiles --- Appraisals | 2 +- abc.txt.tmp | 0 gemfiles/rails_6.gemfile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 abc.txt.tmp diff --git a/Appraisals b/Appraisals index 7e3495a..2229ea7 100644 --- a/Appraisals +++ b/Appraisals @@ -5,7 +5,7 @@ appraise 'rails-5' do end appraise 'rails-6' do - gem 'activesupport', '~> 6.0' + gem 'activesupport', '~> 7.0' end appraise 'rails-7' do diff --git a/abc.txt.tmp b/abc.txt.tmp new file mode 100644 index 0000000..e69de29 diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 874447e..1e07183 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -13,6 +13,6 @@ gem "concurrent-ruby", "~> 1.0", "< 1.3.5" gem "base64", ">= 0.2.0" gem "bigdecimal", ">= 3.1" gem "mutex_m", ">= 0.3.0" -gem "activesupport", "~> 6.0" +gem "activesupport", "~> 7.0" gemspec path: "../" From 261a0b76fc064c7c5e6db7500482c8943856a0df Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Wed, 19 Feb 2025 14:43:06 -0800 Subject: [PATCH 2/3] remove tmp file --- abc.txt.tmp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 abc.txt.tmp diff --git a/abc.txt.tmp b/abc.txt.tmp deleted file mode 100644 index e69de29..0000000 From 6f2f36a5a286a4f1a2365de0a4148f4b93437f45 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Thu, 20 Feb 2025 10:00:54 -0800 Subject: [PATCH 3/3] fix appraisal file --- Appraisals | 12 ++---------- Gemfile | 1 + Gemfile.lock | 3 +++ ...ls_5.gemfile => activesupport_7_0.gemfile} | 3 ++- ...ls_6.gemfile => activesupport_7_1.gemfile} | 3 ++- ...ls_7.gemfile => activesupport_7_2.gemfile} | 3 ++- gemfiles/activesupport_8_0.gemfile | 19 +++++++++++++++++++ 7 files changed, 31 insertions(+), 13 deletions(-) rename gemfiles/{rails_5.gemfile => activesupport_7_0.gemfile} (86%) rename gemfiles/{rails_6.gemfile => activesupport_7_1.gemfile} (86%) rename gemfiles/{rails_7.gemfile => activesupport_7_2.gemfile} (86%) create mode 100644 gemfiles/activesupport_8_0.gemfile diff --git a/Appraisals b/Appraisals index 2229ea7..75fd399 100644 --- a/Appraisals +++ b/Appraisals @@ -1,13 +1,5 @@ # frozen_string_literal: true -appraise 'rails-5' do - gem 'activesupport', '~> 5.2' -end +require "appraisal/matrix" -appraise 'rails-6' do - gem 'activesupport', '~> 7.0' -end - -appraise 'rails-7' do - gem 'activesupport', '~> 7.0' -end +appraisal_matrix(activesupport: "7.0") diff --git a/Gemfile b/Gemfile index 7eaa48b..dcf5663 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ source 'https://rubygems.org' gemspec gem 'appraisal' +gem 'appraisal-matrix' gem 'pry' gem 'rake' gem 'rspec', '~> 3.7' diff --git a/Gemfile.lock b/Gemfile.lock index 194c2c6..2608369 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,6 +17,8 @@ GEM bundler rake thor (>= 0.14.0) + appraisal-matrix (0.3.0) + appraisal (~> 2.2) ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.9) @@ -71,6 +73,7 @@ PLATFORMS DEPENDENCIES appraisal + appraisal-matrix base64 (>= 0.2.0) bigdecimal (>= 3.1) concurrent-ruby (~> 1.0, < 1.3.5) diff --git a/gemfiles/rails_5.gemfile b/gemfiles/activesupport_7_0.gemfile similarity index 86% rename from gemfiles/rails_5.gemfile rename to gemfiles/activesupport_7_0.gemfile index 63db74d..97d7028 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/activesupport_7_0.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "appraisal" +gem "appraisal-matrix" gem "pry" gem "rake" gem "rspec", "~> 3.7" @@ -13,6 +14,6 @@ gem "concurrent-ruby", "~> 1.0", "< 1.3.5" gem "base64", ">= 0.2.0" gem "bigdecimal", ">= 3.1" gem "mutex_m", ">= 0.3.0" -gem "activesupport", "~> 5.2" +gem "activesupport", "~> 7.0.0" gemspec path: "../" diff --git a/gemfiles/rails_6.gemfile b/gemfiles/activesupport_7_1.gemfile similarity index 86% rename from gemfiles/rails_6.gemfile rename to gemfiles/activesupport_7_1.gemfile index 1e07183..9d312b4 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/activesupport_7_1.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "appraisal" +gem "appraisal-matrix" gem "pry" gem "rake" gem "rspec", "~> 3.7" @@ -13,6 +14,6 @@ gem "concurrent-ruby", "~> 1.0", "< 1.3.5" gem "base64", ">= 0.2.0" gem "bigdecimal", ">= 3.1" gem "mutex_m", ">= 0.3.0" -gem "activesupport", "~> 7.0" +gem "activesupport", "~> 7.1.0" gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile b/gemfiles/activesupport_7_2.gemfile similarity index 86% rename from gemfiles/rails_7.gemfile rename to gemfiles/activesupport_7_2.gemfile index 1e07183..c36f65e 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/activesupport_7_2.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "appraisal" +gem "appraisal-matrix" gem "pry" gem "rake" gem "rspec", "~> 3.7" @@ -13,6 +14,6 @@ gem "concurrent-ruby", "~> 1.0", "< 1.3.5" gem "base64", ">= 0.2.0" gem "bigdecimal", ">= 3.1" gem "mutex_m", ">= 0.3.0" -gem "activesupport", "~> 7.0" +gem "activesupport", "~> 7.2.0" gemspec path: "../" diff --git a/gemfiles/activesupport_8_0.gemfile b/gemfiles/activesupport_8_0.gemfile new file mode 100644 index 0000000..a977c92 --- /dev/null +++ b/gemfiles/activesupport_8_0.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal" +gem "appraisal-matrix" +gem "pry" +gem "rake" +gem "rspec", "~> 3.7" +gem "rspec_junit_formatter", "~> 0.4" +gem "rspec-mocks" +gem "rubocop", "0.54.0" +gem "concurrent-ruby", "~> 1.0", "< 1.3.5" +gem "base64", ">= 0.2.0" +gem "bigdecimal", ">= 3.1" +gem "mutex_m", ">= 0.3.0" +gem "activesupport", "~> 8.0.0" + +gemspec path: "../"