From 3bbdcfa68b550bf53a7d9a496c4e6ef58e23d8f0 Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Mon, 11 Nov 2024 14:15:47 +0900 Subject: [PATCH] Drop Rails 6.1 support --- .github/workflows/ci.yml | 2 +- Appraisals | 5 ----- CHANGELOG.md | 8 +++++--- README.md | 4 ++-- active_record_encryption.gemspec | 2 +- gemfiles/6.1_stable.gemfile | 8 -------- 6 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 gemfiles/6.1_stable.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dab8227..1ac5b29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - gemfile: ['6.1_stable', '7.0_stable', '7.1_stable', '7.2_stable'] + gemfile: ['7.0_stable', '7.1_stable', '7.2_stable'] ruby-version: ['3.1', '3.2', '3.3'] services: mysql: diff --git a/Appraisals b/Appraisals index 85f8d61..37ac6ff 100644 --- a/Appraisals +++ b/Appraisals @@ -1,10 +1,5 @@ # frozen_string_literal: true -appraise '6.1-stable' do - gem 'activerecord', '~> 6.1.0' - gem 'sqlite3', '~> 1.7.0' -end - appraise '7.0-stable' do gem 'activerecord', '~> 7.0.0' gem 'sqlite3', '~> 1.7.0' diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b3c089..38b763f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ +## Unreleased + +- Drop Rails 6.1 support #36 + ## 1.0.0 -- EOL Ruby and Rails no longer supported #29 - - Requires Ruby 3.0.0 or newer. - - Requires Rails 6.1.0 or newer. +- EOL Ruby and Rails no longer supported #29 #30 - Support rails 7.0.0 #25 - Support rails 7.1.0 #31 - Migrate CI from travis.ci to GitHub Action. #27 diff --git a/README.md b/README.md index 0f3c4ac..315f580 100644 --- a/README.md +++ b/README.md @@ -117,9 +117,9 @@ end ### Run spec ```bash +docker compose up -d bundle exec appraisal install -bundle exec appraisal 6.1-stable rspec -bundle exec appraisal 7.0-stable rspec +bundle exec appraisal rspec ``` ## Contributing diff --git a/active_record_encryption.gemspec b/active_record_encryption.gemspec index 58cd7df..04acbf4 100644 --- a/active_record_encryption.gemspec +++ b/active_record_encryption.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| LICENSE.txt ] + Dir['lib/**/*.rb'] - spec.add_dependency 'activerecord', '>= 6.1' + spec.add_dependency 'activerecord', '>= 7.0' spec.add_development_dependency 'appraisal' spec.add_development_dependency 'guard-rspec' diff --git a/gemfiles/6.1_stable.gemfile b/gemfiles/6.1_stable.gemfile deleted file mode 100644 index 9f0d5e3..0000000 --- a/gemfiles/6.1_stable.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activerecord", "~> 6.1.0" -gem "sqlite3", "~> 1.7.0" - -gemspec path: "../"