From 1636a9b11b7d65d1257702195d7df4e43f52f6a3 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Mon, 2 Dec 2024 09:24:59 +0100 Subject: [PATCH 01/13] Added Rails 8.0 to the test matrix --- Appraisals | 1 + gemfiles/rails_8.0.gemfile | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 gemfiles/rails_8.0.gemfile diff --git a/Appraisals b/Appraisals index dbae566..4caa625 100644 --- a/Appraisals +++ b/Appraisals @@ -3,6 +3,7 @@ rails_versions = %w( 6.1 7.0 7.1 + 8.0 ) rails_versions.each do |version| diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile new file mode 100644 index 0000000..1d09e73 --- /dev/null +++ b/gemfiles/rails_8.0.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 8.0.0" +gem "rails-controller-testing" + +gemspec path: "../" From 660966b5d0dcf15ad2594128d5c9fc62f2bcd6c4 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 6 Dec 2024 20:04:08 +0100 Subject: [PATCH 02/13] Added Rails 8.0 to test matrix --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67b8fd3..78a9cb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,10 @@ jobs: fail-fast: false matrix: ruby-version: ['3.0', '3.1', '3.2', '3.3'] - gemfile: ['rails_6.0','rails_6.1','rails_7.0', 'rails_7.1'] + gemfile: ['rails_6.0','rails_6.1','rails_7.0', 'rails_7.1', 'rails_8.0'] + exclude: + - gemfile: rails_8.0 + ruby-version: ['3.0', '3.1'] runs-on: ubuntu-latest env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile From 8608b82fc3374ea3ea81cd272b7e5a7e592b4f60 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 6 Dec 2024 22:13:28 +0100 Subject: [PATCH 03/13] It should be one ignore per line --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78a9cb4..64f3137 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,9 @@ jobs: gemfile: ['rails_6.0','rails_6.1','rails_7.0', 'rails_7.1', 'rails_8.0'] exclude: - gemfile: rails_8.0 - ruby-version: ['3.0', '3.1'] + ruby-version: '3.0' + - gemfile: rails_8.0 + ruby-version: '3.1' runs-on: ubuntu-latest env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile From c374d0bdd0a1f9f2d3ad874ceed7348e796f4254 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 6 Dec 2024 22:15:49 +0100 Subject: [PATCH 04/13] It should be one ignore per line --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64f3137..2404b63 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,10 @@ jobs: ruby-version: ['3.0', '3.1', '3.2', '3.3'] gemfile: ['rails_6.0','rails_6.1','rails_7.0', 'rails_7.1', 'rails_8.0'] exclude: - - gemfile: rails_8.0 - ruby-version: '3.0' - - gemfile: rails_8.0 - ruby-version: '3.1' + - ruby-version: '3.0' + gemfile: 'rails_8.0' + - ruby-version: '3.1' + gemfile: 'rails_8.0' runs-on: ubuntu-latest env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile From dfeaee6f0e42bcf13282ca48cbd6632628a0f1c6 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 7 Feb 2025 09:48:30 +0100 Subject: [PATCH 05/13] Added Rails 7.2 and dropped 6.0 --- .github/workflows/ci.yml | 22 +++++++++++----------- Appraisals | 2 +- Gemfile.lock | 2 +- gemfiles/rails_6.0.gemfile | 8 -------- high_voltage.gemspec | 2 +- 5 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 gemfiles/rails_6.0.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2404b63..15ce4cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['3.0', '3.1', '3.2', '3.3'] - gemfile: ['rails_6.0','rails_6.1','rails_7.0', 'rails_7.1', 'rails_8.0'] + ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4'] + gemfile: ['rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_8.0'] exclude: - ruby-version: '3.0' gemfile: 'rails_8.0' @@ -23,12 +23,12 @@ jobs: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile name: Specs - Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }} steps: - - uses: actions/checkout@v4 - - name: Set up Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }} - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true - rubygems: default - - name: Run specs - run: bundle exec rake spec + - uses: actions/checkout@v4 + - name: Set up Ruby ${{ matrix.ruby-version }} with ${{ matrix.gemfile }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true + rubygems: default + - name: Run specs + run: bundle exec rake spec diff --git a/Appraisals b/Appraisals index 4caa625..24d75fd 100644 --- a/Appraisals +++ b/Appraisals @@ -1,8 +1,8 @@ rails_versions = %w( - 6.0 6.1 7.0 7.1 + 7.2 8.0 ) diff --git a/Gemfile.lock b/Gemfile.lock index 91638cb..9597b2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,7 +141,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (>= 6.0) + activesupport (>= 6.1) appraisal capybara high_voltage! diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index 57b8b42..0000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 6.0.0" -gem "rails-controller-testing" - -gemspec path: "../" diff --git a/high_voltage.gemspec b/high_voltage.gemspec index c43bedc..38c572e 100644 --- a/high_voltage.gemspec +++ b/high_voltage.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.required_ruby_version = '>= 3.0' - s.add_development_dependency('activesupport', '>= 6.0') + s.add_development_dependency('activesupport', '>= 6.1') s.add_development_dependency('appraisal') s.add_development_dependency('capybara') s.add_development_dependency('pry') From 46750566ed96f9443f1c8b8ede489cc40a27c598 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 7 Feb 2025 09:48:40 +0100 Subject: [PATCH 06/13] Added Rails 7.2 and dropped 6.0 --- gemfiles/rails_7.2.gemfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 gemfiles/rails_7.2.gemfile diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile new file mode 100644 index 0000000..7a96841 --- /dev/null +++ b/gemfiles/rails_7.2.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 7.2.0" +gem "rails-controller-testing" + +gemspec path: "../" From 1640b445a0d0260ff2800a26c2a53edcbf89a293 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 7 Feb 2025 10:36:15 +0100 Subject: [PATCH 07/13] Added activemodel dependency for tests and requiring logger --- Gemfile.lock | 5 ++++- high_voltage.gemspec | 1 + spec/spec_helper.rb | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9597b2d..a541a32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,6 +22,8 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + activemodel (7.1.4) + activesupport (= 7.1.4) activesupport (7.1.4) base64 bigdecimal @@ -141,6 +143,7 @@ PLATFORMS ruby DEPENDENCIES + activemodel (>= 6.1) activesupport (>= 6.1) appraisal capybara @@ -149,4 +152,4 @@ DEPENDENCIES rspec-rails (~> 5.1.2) BUNDLED WITH - 2.2.33 + 2.6.3 diff --git a/high_voltage.gemspec b/high_voltage.gemspec index 38c572e..93f8f17 100644 --- a/high_voltage.gemspec +++ b/high_voltage.gemspec @@ -23,6 +23,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.0' s.add_development_dependency('activesupport', '>= 6.1') + s.add_development_dependency('activemodel', '>= 6.1') s.add_development_dependency('appraisal') s.add_development_dependency('capybara') s.add_development_dependency('pry') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 28ec2b9..86d6a15 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,7 @@ ENV["RAILS_ENV"] = "test" require "pry" +require "logger" require "active_model/railtie" require "action_controller/railtie" require "action_view/railtie" From aec7394b2674a4e72265d9a338d71db4831a81ae Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 7 Feb 2025 15:44:54 +0100 Subject: [PATCH 08/13] Adding mutex and bigdecimal to the dev/test deps and rails 7.2 to the matrix --- .github/workflows/ci.yml | 2 +- Gemfile.lock | 1 + high_voltage.gemspec | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15ce4cd..3b2a477 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4'] - gemfile: ['rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_8.0'] + gemfile: ['rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] exclude: - ruby-version: '3.0' gemfile: 'rails_8.0' diff --git a/Gemfile.lock b/Gemfile.lock index a541a32..1f92629 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,6 +148,7 @@ DEPENDENCIES appraisal capybara high_voltage! + mutex_m pry rspec-rails (~> 5.1.2) diff --git a/high_voltage.gemspec b/high_voltage.gemspec index 93f8f17..9a43805 100644 --- a/high_voltage.gemspec +++ b/high_voltage.gemspec @@ -25,6 +25,8 @@ Gem::Specification.new do |s| s.add_development_dependency('activesupport', '>= 6.1') s.add_development_dependency('activemodel', '>= 6.1') s.add_development_dependency('appraisal') + s.add_development_dependency('bigdecimal') + s.add_development_dependency('mutex_m') s.add_development_dependency('capybara') s.add_development_dependency('pry') s.add_development_dependency('rspec-rails', '~> 5.1.2') From 6d7e6503cf3f96ff21721e8eed84c67f6d73c878 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 7 Feb 2025 16:17:50 +0100 Subject: [PATCH 09/13] Re-add 6.0 and add test deps on appraisal file --- .github/workflows/ci.yml | 4 +++- Appraisals | 5 +++++ Gemfile.lock | 5 ++--- gemfiles/rails_6.1.gemfile | 4 ++++ gemfiles/rails_7.0.gemfile | 4 ++++ gemfiles/rails_7.1.gemfile | 4 ++++ gemfiles/rails_7.2.gemfile | 4 ++++ gemfiles/rails_8.0.gemfile | 4 ++++ high_voltage.gemspec | 6 ++---- 9 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b2a477..f84e801 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,12 +12,14 @@ jobs: fail-fast: false matrix: ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4'] - gemfile: ['rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] + gemfile: ['rails_6.0', 'rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] exclude: - ruby-version: '3.0' gemfile: 'rails_8.0' - ruby-version: '3.1' gemfile: 'rails_8.0' + - ruby-version: '3.0' + gemfile: 'rails_7.2' runs-on: ubuntu-latest env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/Appraisals b/Appraisals index 24d75fd..4d023a2 100644 --- a/Appraisals +++ b/Appraisals @@ -1,4 +1,5 @@ rails_versions = %w( + 6.0 6.1 7.0 7.1 @@ -9,6 +10,10 @@ rails_versions = %w( rails_versions.each do |version| appraise "rails_#{version}" do gem "rails", "~> #{version}.0" + gem "bigdecimal" + gem "drb" + gem "logger" + gem "mutex_m" gem "rails-controller-testing" end end diff --git a/Gemfile.lock b/Gemfile.lock index 1f92629..14a7792 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,12 +143,11 @@ PLATFORMS ruby DEPENDENCIES - activemodel (>= 6.1) - activesupport (>= 6.1) + activemodel (>= 6.0) + activesupport (>= 6.0) appraisal capybara high_voltage! - mutex_m pry rspec-rails (~> 5.1.2) diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 1a36ab8..3c61c7d 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -3,6 +3,10 @@ source "https://rubygems.org" gem "rails", "~> 6.1.0" +gem "bigdecimal" +gem "mutex_m" +gem "logger" +gem "drb" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 2be2eae..6a7a9de 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,6 +3,10 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" +gem "bigdecimal" +gem "mutex_m" +gem "logger" +gem "drb" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 45820b6..7e5fc2a 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -3,6 +3,10 @@ source "https://rubygems.org" gem "rails", "~> 7.1.0" +gem "bigdecimal" +gem "mutex_m" +gem "logger" +gem "drb" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index 7a96841..b9d691c 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -3,6 +3,10 @@ source "https://rubygems.org" gem "rails", "~> 7.2.0" +gem "bigdecimal" +gem "mutex_m" +gem "logger" +gem "drb" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index 1d09e73..6c5c8b8 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -3,6 +3,10 @@ source "https://rubygems.org" gem "rails", "~> 8.0.0" +gem "bigdecimal" +gem "mutex_m" +gem "logger" +gem "drb" gem "rails-controller-testing" gemspec path: "../" diff --git a/high_voltage.gemspec b/high_voltage.gemspec index 9a43805..6a9407c 100644 --- a/high_voltage.gemspec +++ b/high_voltage.gemspec @@ -22,11 +22,9 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.required_ruby_version = '>= 3.0' - s.add_development_dependency('activesupport', '>= 6.1') - s.add_development_dependency('activemodel', '>= 6.1') + s.add_development_dependency('activesupport', '>= 6.0') + s.add_development_dependency('activemodel', '>= 6.0') s.add_development_dependency('appraisal') - s.add_development_dependency('bigdecimal') - s.add_development_dependency('mutex_m') s.add_development_dependency('capybara') s.add_development_dependency('pry') s.add_development_dependency('rspec-rails', '~> 5.1.2') From 6fa282022894e008b070a616ca8e0f0186413480 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 7 Feb 2025 16:17:55 +0100 Subject: [PATCH 10/13] Re-add 6.0 and add test deps on appraisal file --- gemfiles/rails_6.0.gemfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 gemfiles/rails_6.0.gemfile diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile new file mode 100644 index 0000000..5a8aab7 --- /dev/null +++ b/gemfiles/rails_6.0.gemfile @@ -0,0 +1,12 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6.0.0" +gem "bigdecimal" +gem "mutex_m" +gem "logger" +gem "drb" +gem "rails-controller-testing" + +gemspec path: "../" From 740241e46f15d1fcd3fdadfbbd427968b693c19d Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Fri, 7 Feb 2025 16:22:33 +0100 Subject: [PATCH 11/13] Fix dependencies --- Gemfile.lock | 3 --- gemfiles/rails_6.0.gemfile | 4 ++-- gemfiles/rails_6.1.gemfile | 4 ++-- gemfiles/rails_7.0.gemfile | 4 ++-- gemfiles/rails_7.1.gemfile | 4 ++-- gemfiles/rails_7.2.gemfile | 4 ++-- gemfiles/rails_8.0.gemfile | 4 ++-- high_voltage.gemspec | 1 - 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 14a7792..60e1386 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,8 +22,6 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (7.1.4) - activesupport (= 7.1.4) activesupport (7.1.4) base64 bigdecimal @@ -143,7 +141,6 @@ PLATFORMS ruby DEPENDENCIES - activemodel (>= 6.0) activesupport (>= 6.0) appraisal capybara diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 5a8aab7..e2137d2 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -4,9 +4,9 @@ source "https://rubygems.org" gem "rails", "~> 6.0.0" gem "bigdecimal" -gem "mutex_m" -gem "logger" gem "drb" +gem "logger" +gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 3c61c7d..b488679 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -4,9 +4,9 @@ source "https://rubygems.org" gem "rails", "~> 6.1.0" gem "bigdecimal" -gem "mutex_m" -gem "logger" gem "drb" +gem "logger" +gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 6a7a9de..995c665 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -4,9 +4,9 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" gem "bigdecimal" -gem "mutex_m" -gem "logger" gem "drb" +gem "logger" +gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 7e5fc2a..e6dd2ec 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -4,9 +4,9 @@ source "https://rubygems.org" gem "rails", "~> 7.1.0" gem "bigdecimal" -gem "mutex_m" -gem "logger" gem "drb" +gem "logger" +gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index b9d691c..7b34583 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -4,9 +4,9 @@ source "https://rubygems.org" gem "rails", "~> 7.2.0" gem "bigdecimal" -gem "mutex_m" -gem "logger" gem "drb" +gem "logger" +gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index 6c5c8b8..79355db 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -4,9 +4,9 @@ source "https://rubygems.org" gem "rails", "~> 8.0.0" gem "bigdecimal" -gem "mutex_m" -gem "logger" gem "drb" +gem "logger" +gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/high_voltage.gemspec b/high_voltage.gemspec index 6a9407c..c43bedc 100644 --- a/high_voltage.gemspec +++ b/high_voltage.gemspec @@ -23,7 +23,6 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.0' s.add_development_dependency('activesupport', '>= 6.0') - s.add_development_dependency('activemodel', '>= 6.0') s.add_development_dependency('appraisal') s.add_development_dependency('capybara') s.add_development_dependency('pry') From 322124e083623c4955e1cfde82289810452cf5f8 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Sat, 8 Feb 2025 14:51:35 +0100 Subject: [PATCH 12/13] Post CR: Drop support for older Ruby/Rails version --- .github/workflows/ci.yml | 8 ++------ Appraisals | 13 +++++++------ Gemfile.lock | 2 +- gemfiles/rails_7.0.gemfile | 1 + gemfiles/rails_7.1.gemfile | 4 ---- gemfiles/rails_7.2.gemfile | 4 ---- gemfiles/rails_8.0.gemfile | 4 ---- high_voltage.gemspec | 4 ++-- 8 files changed, 13 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f84e801..c9383e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,15 +11,11 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4'] - gemfile: ['rails_6.0', 'rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] + ruby-version: ['3.1', '3.2', '3.3', '3.4'] + gemfile: ['rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0'] exclude: - - ruby-version: '3.0' - gemfile: 'rails_8.0' - ruby-version: '3.1' gemfile: 'rails_8.0' - - ruby-version: '3.0' - gemfile: 'rails_7.2' runs-on: ubuntu-latest env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/Appraisals b/Appraisals index 4d023a2..8d1a578 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,4 @@ rails_versions = %w( - 6.0 - 6.1 7.0 7.1 7.2 @@ -10,10 +8,13 @@ rails_versions = %w( rails_versions.each do |version| appraise "rails_#{version}" do gem "rails", "~> #{version}.0" - gem "bigdecimal" - gem "drb" - gem "logger" - gem "mutex_m" + if version == "7.0" + gem "benchmark" + gem "bigdecimal" + gem "drb" + gem "logger" + gem "mutex_m" + end gem "rails-controller-testing" end end diff --git a/Gemfile.lock b/Gemfile.lock index 60e1386..9b9d164 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,7 +141,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (>= 6.0) + activesupport (>= 7.0) appraisal capybara high_voltage! diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 995c665..a056ec4 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" +gem "benchmark" gem "bigdecimal" gem "drb" gem "logger" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index e6dd2ec..45820b6 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -3,10 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 7.1.0" -gem "bigdecimal" -gem "drb" -gem "logger" -gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index 7b34583..7a96841 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -3,10 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 7.2.0" -gem "bigdecimal" -gem "drb" -gem "logger" -gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index 79355db..1d09e73 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -3,10 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 8.0.0" -gem "bigdecimal" -gem "drb" -gem "logger" -gem "mutex_m" gem "rails-controller-testing" gemspec path: "../" diff --git a/high_voltage.gemspec b/high_voltage.gemspec index c43bedc..cb5ec34 100644 --- a/high_voltage.gemspec +++ b/high_voltage.gemspec @@ -21,8 +21,8 @@ Gem::Specification.new do |s| s.test_files = [] s.require_paths = ["lib"] - s.required_ruby_version = '>= 3.0' - s.add_development_dependency('activesupport', '>= 6.0') + s.required_ruby_version = '>= 3.1' + s.add_development_dependency('activesupport', '>= 7.0') s.add_development_dependency('appraisal') s.add_development_dependency('capybara') s.add_development_dependency('pry') From 8af3a9da6e9387b26308d49bc2a63bb2a8630284 Mon Sep 17 00:00:00 2001 From: Luiz Eduardo Kowalski Date: Sat, 8 Feb 2025 14:55:27 +0100 Subject: [PATCH 13/13] Delete old gemfiles --- gemfiles/rails_6.0.gemfile | 12 ------------ gemfiles/rails_6.1.gemfile | 12 ------------ 2 files changed, 24 deletions(-) delete mode 100644 gemfiles/rails_6.0.gemfile delete mode 100644 gemfiles/rails_6.1.gemfile diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index e2137d2..0000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 6.0.0" -gem "bigdecimal" -gem "drb" -gem "logger" -gem "mutex_m" -gem "rails-controller-testing" - -gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile deleted file mode 100644 index b488679..0000000 --- a/gemfiles/rails_6.1.gemfile +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 6.1.0" -gem "bigdecimal" -gem "drb" -gem "logger" -gem "mutex_m" -gem "rails-controller-testing" - -gemspec path: "../"