Merge branch 'core' into feat-after_restore_commit

rubysherpas · Sep 3, 2024 · 3be8277 · 3be8277
2 parents b918e39 + f441c37
commit 3be8277
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,32 +15,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: ["~> 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
-            rails: 'edge'
-          - ruby: 3.2
-            rails: '~> 7.1.0'
-          # single test failure with jruby
-          #- ruby: jruby-9.4
-          #  rails: '~> 7.0.0'
-          - ruby: 2.6
-            rails: '~> 6.1.0'
-          - ruby: 2.6
-            rails: '~> 6.0.0'
-          - ruby: 2.6
-            rails: '~> 5.2.0'
-          - ruby: 2.6
-            rails: '~> 5.1.0'
-          - ruby: 2.5
-            rails: '~> 6.0.0'
-          - ruby: 2.5
-            rails: '~> 5.2.0'
-          - ruby: 2.5
-            rails: '~> 5.1.0'
-        #os: ubuntu-latest
-        #arch: x64
+        rails: ["edge", "~> 7.2.0", "~> 7.1.0", "~> 7.0.0", "~> 6.1.0"]
+        ruby: ["3.3","3.2", "3.1", "3.0", "2.7"]
+        exclude:
+          - rails: "~> 7.2.0"
+            ruby: "3.0"
+          - rails: "~> 7.2.0"
+            ruby: "2.7"
+          - rails: "edge"
+            ruby: "3.0"
+          - rails: "edge"
+            ruby: "2.7"
+
+
 
     env:
       RAILS: ${{ matrix.rails }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,13 @@
 # paranoia Changelog
 
-## 2.6.4 - July 20, 2024
+## 3.0.0 - August 13, 2024
+
+_Tagged as 3.0 as Ruby + Rails version constraints have been modernised._
 
-Add support for [Rails 7.2](https://github.com/rails/rails/releases/tag/v7.2.0)
+- [#564](https://github.com/rubysherpas/paranoia/pull/564) Support Rails edge
+- [#563](https://github.com/rubysherpas/paranoia/pull/563) Support Rails 7.2
+
+## 2.6.4 - July 20, 2024
 
 * [#554](https://github.com/rubysherpas/paranoia/pull/554) Support prebuilt counter cache association list (#554)
   [Joé Dupuis](https://github.com/JoeDupuis)
@@ -18,7 +23,7 @@ Add support for [Rails 7.2](https://github.com/rails/rails/releases/tag/v7.2.0)
 
 ## 2.6.2 - Jun 6, 2023
 
-* [#441](https://github.com/rubysherpas/paranoia/pull/441) Recursive restore with has_many/one through assocs (#441) 
+* [#441](https://github.com/rubysherpas/paranoia/pull/441) Recursive restore with has_many/one through assocs (#441)
   [Emil Ong](https://github.com/emilong)
 
 ## 2.6.1 - Nov 16, 2022

diff --git a/Gemfile b/Gemfile
@@ -5,10 +5,7 @@ sqlite = ENV['SQLITE_VERSION']
 if sqlite
   gem 'sqlite3', sqlite, platforms: [:ruby]
 else
-  # Do not use sqlite3 v2.0.0 or later because it is not compatible with the current Rails version.
-  # We can remove this constraint when Rails 7.2 is released.
-  # See https://github.com/rails/rails/pull/51592 and https://github.com/rails/rails/blob/v7.2.0.rc1/activerecord/CHANGELOG.md#rails-720beta1-may-29-2024
-  gem 'sqlite3', "~> 1.4", platforms: [:ruby]
+  gem 'sqlite3', '~> 1.4', platforms: [:ruby]
 end
 
 platforms :jruby do

diff --git a/lib/paranoia/version.rb b/lib/paranoia/version.rb
@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.6.4'.freeze
+  VERSION = '3.0.0'.freeze
 end
diff --git a/paranoia.gemspec b/paranoia.gemspec
@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'activerecord', '>= 5.1', '< 7.2'
+  s.add_dependency 'activerecord', '>= 6', '< 8.1'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"