From 8abe3a21a91ef4ed89c87bce926f6bfe40b78724 Mon Sep 17 00:00:00 2001 From: Andrew Hampton Date: Mon, 12 Aug 2024 08:14:35 -0400 Subject: [PATCH 1/2] Add support for Rails 7.2 --- .github/workflows/build.yml | 8 +++++++- Gemfile | 2 +- paranoia.gemspec | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a603c725..b5504116 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - rails: ["~> 7.1.0", "~> 7.0.0", "~> 6.1.0", "~> 6.0.0"] + rails: ["~> 7.2.0", "~> 7.1.0", "~> 7.0.0", "~> 6.1.0", "~> 6.0.0"] ruby: ["3.2.2", "3.1.4", "3.0.6", "2.7.8"] include: - ruby: 3.2 @@ -39,6 +39,12 @@ jobs: rails: '~> 5.2.0' - ruby: 2.5 rails: '~> 5.1.0' + exclude: + # Rails 7.2.0 requires Ruby 3.1.0 or later + - ruby: "3.0.6" + rails: "~> 7.2.0" + - ruby: "2.7.8" + rails: "~> 7.2.0" #os: ubuntu-latest #arch: x64 diff --git a/Gemfile b/Gemfile index fe5f736b..66ecd287 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ sqlite = ENV['SQLITE_VERSION'] if sqlite gem 'sqlite3', sqlite, platforms: [:ruby] else - gem 'sqlite3', platforms: [:ruby] + gem 'sqlite3', '~> 1.4', platforms: [:ruby] end platforms :jruby do diff --git a/paranoia.gemspec b/paranoia.gemspec index 8e89bb40..c87485f6 100644 --- a/paranoia.gemspec +++ b/paranoia.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.5' - s.add_dependency 'activerecord', '>= 5.1', '< 7.2' + s.add_dependency 'activerecord', '>= 5.1', '< 8.0' s.add_development_dependency "bundler", ">= 1.0.0" s.add_development_dependency "rake" From 257e8cb44c5a99d403cd7ab7a229a4de661e148c Mon Sep 17 00:00:00 2001 From: Andrew Hampton Date: Mon, 12 Aug 2024 08:45:24 -0400 Subject: [PATCH 2/2] Remove Rails 7.2 changelog entry v2.6.4 doesn't actually support Rails 7.2, so drop this item from the changelog. --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dbe020d..5e25af2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ ## 2.6.4 - July 20, 2024 -Add support for [Rails 7.2](https://github.com/rails/rails/releases/tag/v7.2.0) - * [#554](https://github.com/rubysherpas/paranoia/pull/554) Support prebuilt counter cache association list (#554) [JoƩ Dupuis](https://github.com/JoeDupuis) * [#551](https://github.com/rubysherpas/paranoia/pull/551) Fix: restore has_one with scope (#551)