From 7c6824a316c365c6d2996907a71e1fad8840356f Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Tue, 17 Dec 2024 20:38:42 -0800 Subject: [PATCH] Drop 7.1 files / identifiers from the master branch Best I can tell, the intent is to keep ONE version on master or versioned branch but for some reason 7.1 added a 7.2.beta and kept it around for a bit. I think this brings it back to the original intent. Long term: nuke the gemfiles directory. Remove gemfiles from the CI matrix. Unify. --- .github/workflows/ci.yml | 8 -------- .rubocop.yml | 2 +- gemfiles/rails-7.1.0.gemfile | 12 ------------ minitest-rails.gemspec | 4 ++-- test/helper.rb | 2 +- 5 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 gemfiles/rails-7.1.0.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0881688..b3a501b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,19 +18,11 @@ jobs: fail-fast: false matrix: ruby: - - '2.7' - - '3.0' - '3.1' - '3.2' - '3.3' gemfile: - - gemfiles/rails-7.1.0.gemfile - gemfiles/rails-7.2.0.gemfile - exclude: - - ruby: '2.7' - gemfile: gemfiles/rails-7.2.0.gemfile - - ruby: '3.0' - gemfile: gemfiles/rails-7.2.0.gemfile env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} diff --git a/.rubocop.yml b/.rubocop.yml index a902dbe..dc4bec8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.1 SuggestExtensions: false NewCops: enable diff --git a/gemfiles/rails-7.1.0.gemfile b/gemfiles/rails-7.1.0.gemfile deleted file mode 100644 index 7753174..0000000 --- a/gemfiles/rails-7.1.0.gemfile +++ /dev/null @@ -1,12 +0,0 @@ -source "http://rubygems.org" - -gem "minitest-rails", path: "../" -gem "rails", "~> 7.1.0" -gem "rake" -gem "sqlite3", "~> 1.4" - -gem "minitest-autotest", "~> 1.1" -gem "minitest-focus", "~> 1.4" -gem "minitest-rg", "~> 5.2" -gem "rdoc", "~> 6.5" -gem "rubocop", "~> 1.57.0" diff --git a/minitest-rails.gemspec b/minitest-rails.gemspec index 992be3c..a353c92 100644 --- a/minitest-rails.gemspec +++ b/minitest-rails.gemspec @@ -15,10 +15,10 @@ Gem::Specification.new do |gem| ["README.md", "UPDATING.md", "CHANGELOG.md", "LICENSE"] gem.require_paths = ["lib"] - gem.required_ruby_version = ">= 2.7.0" + gem.required_ruby_version = ">= 3.1" gem.add_dependency "minitest", "~> 5.20" - gem.add_dependency "railties", ">= 7.1.0", "< 8.0.0" + gem.add_dependency "railties", ">= 7.2.0", "< 8.0.0" gem.add_development_dependency "minitest-autotest", "~> 1.1" gem.add_development_dependency "minitest-focus", "~> 1.4" diff --git a/test/helper.rb b/test/helper.rb index 102d60f..47e0295 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -26,7 +26,7 @@ class Application < ::Rails::Application config.secret_key_base = "abc123" config.hosts << "www.example.com" config.eager_load = false - config.load_defaults 7.1 + config.load_defaults 7.2 end end