From a3a10964066639403804eef97c80d0f833fa02c8 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <me@ryanbigg.com>
Date: Tue, 13 Aug 2024 12:41:26 +1000
Subject: [PATCH 1/4] See what happens on Rails edge

---
 .github/workflows/build.yml | 34 ++--------------------------------
 paranoia.gemspec            |  2 +-
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b5504116..e0e1fd30 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,38 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        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
-            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'
-        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
+        rails: ["edge", "~> 7.2.0", "~> 7.1.0", "~> 7.0.0"]
+        ruby: ["3.3","3.2", "3.1"]
 
     env:
       RAILS: ${{ matrix.rails }}
diff --git a/paranoia.gemspec b/paranoia.gemspec
index c87485f6..4f02c02d 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', '< 8.0'
+  s.add_dependency 'activerecord', '>= 5.1', '< 8.1'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"

From 79d8ba079f96d3b0e33a07c2268e1d1da5cf4277 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <me@ryanbigg.com>
Date: Tue, 13 Aug 2024 12:45:05 +1000
Subject: [PATCH 2/4] Tweak support for Ruby 2.7

---
 .github/workflows/build.yml | 4 ++--
 CHANGELOG.md                | 6 +++++-
 paranoia.gemspec            | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0e1fd30..f0f862be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: ["edge", "~> 7.2.0", "~> 7.1.0", "~> 7.0.0"]
-        ruby: ["3.3","3.2", "3.1"]
+        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"]
 
     env:
       RAILS: ${{ matrix.rails }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e25af2f..071d160d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # paranoia Changelog
 
+## 3.0.0 - August 13, 2024
+
+- [#563](https://github.com/rubysherpas/paranoia/pull/563) Support Rails 7.2 & Rails 8.0
+
 ## 2.6.4 - July 20, 2024
 
 * [#554](https://github.com/rubysherpas/paranoia/pull/554) Support prebuilt counter cache association list (#554)
@@ -16,7 +20,7 @@
 
 ## 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/paranoia.gemspec b/paranoia.gemspec
index 4f02c02d..9baf38e6 100644
--- 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', '< 8.1'
+  s.add_dependency 'activerecord', '>= 6', '< 8.1'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"

From ba1549f8afa32d03cfc13fffc74938602c5d5975 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <me@ryanbigg.com>
Date: Tue, 13 Aug 2024 12:47:52 +1000
Subject: [PATCH 3/4] Add Ruby exclusions

---
 .github/workflows/build.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f0f862be..64dc6aa4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,17 @@ jobs:
       matrix:
         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 }}

From 7bc01f86e23bd9483e43ce9ddafcd6d7c054d4d8 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <me@ryanbigg.com>
Date: Tue, 13 Aug 2024 12:51:13 +1000
Subject: [PATCH 4/4] Correct exclusion syntax

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64dc6aa4..66c036d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,9 +18,9 @@ jobs:
         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"
+          - rails: "~> 7.2.0"
             ruby: "3.0"
-          - rails: "7.2.0"
+          - rails: "~> 7.2.0"
             ruby: "2.7"
           - rails: "edge"
             ruby: "3.0"