From 88be25551ce8f64885a10b17989f7a43ae7ac9d5 Mon Sep 17 00:00:00 2001
From: Jennifer Page <jennifer.page@ezcater.com>
Date: Mon, 3 Feb 2025 07:09:42 -0500
Subject: [PATCH 1/2] Add support for activerecord 8.0, ruby 3.4 (#35)

---
 .github/workflows/ci.yml                     | 12 ++++++++++--
 Appraisals                                   |  4 ++++
 CHANGELOG.md                                 |  4 ++++
 activerecord-postgres_pub_sub.gemspec        |  2 +-
 gemfiles/activerecord_8.0.gemfile            |  7 +++++++
 lib/activerecord/postgres_pub_sub/version.rb |  2 +-
 6 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 gemfiles/activerecord_8.0.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74cbcf4..87492eb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,11 +37,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        activerecord: [ '6.1', '7.0', '7.1', '7.2' ]
-        ruby: [ '3.0', '3.1', '3.2', '3.3' ]
+        activerecord: [ '6.1', '7.0', '7.1', '7.2', '8.0' ]
+        ruby: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
         exclude:
+          - activerecord: '6.1'
+            ruby: '3.4'
+          - activerecord: '7.0'
+            ruby: '3.4'
           - activerecord: '7.2'
             ruby: '3.0'
+          - activerecord: '8.0'
+            ruby: '3.0'
+          - activerecord: '8.0'
+            ruby: '3.1'
     timeout-minutes: 10
     needs:
       - lint
diff --git a/Appraisals b/Appraisals
index eb969f0..4c40dc1 100644
--- a/Appraisals
+++ b/Appraisals
@@ -15,3 +15,7 @@ end
 appraise "activerecord_7.2" do
   gem "activerecord", ">= 7.2.0", "< 7.3"
 end
+
+appraise "activerecord_8.0" do
+  gem "activerecord", ">= 8.0.0", "< 8.1"
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7024da6..a1ec6db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # activerecord-postgres_pub_sub
 
+## v3.2.0
+- Add support for ActiveRecord 8.0
+- Add support for Ruby 3.4
+
 ## v3.1.0
 - Add support for ActiveRecord 7.2
 - Add support for Ruby 3.3
diff --git a/activerecord-postgres_pub_sub.gemspec b/activerecord-postgres_pub_sub.gemspec
index 7afa489..15162d7 100644
--- a/activerecord-postgres_pub_sub.gemspec
+++ b/activerecord-postgres_pub_sub.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 3.0.0"
 
-  spec.add_runtime_dependency "activerecord", "> 6.0", "< 7.3"
+  spec.add_runtime_dependency "activerecord", "> 6.0", "< 8.1"
   spec.add_runtime_dependency "pg", "~> 1.1"
   spec.add_runtime_dependency "private_attr"
   spec.add_runtime_dependency "with_advisory_lock"
diff --git a/gemfiles/activerecord_8.0.gemfile b/gemfiles/activerecord_8.0.gemfile
new file mode 100644
index 0000000..2ab079f
--- /dev/null
+++ b/gemfiles/activerecord_8.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", ">= 8.0.0", "< 8.1"
+
+gemspec path: "../"
diff --git a/lib/activerecord/postgres_pub_sub/version.rb b/lib/activerecord/postgres_pub_sub/version.rb
index 649737d..5ec5a49 100644
--- a/lib/activerecord/postgres_pub_sub/version.rb
+++ b/lib/activerecord/postgres_pub_sub/version.rb
@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PostgresPubSub
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

From 3e61e2291d999be25cf9bd77842402761008eb65 Mon Sep 17 00:00:00 2001
From: Jennifer Page <jennifer.page@ezcater.com>
Date: Mon, 3 Feb 2025 07:25:29 -0500
Subject: [PATCH 2/2] fix(specs): uninitialized constant
 ActiveSupport::LoggerThreadSafeLevel::Logger

rails/rails#54260 concurrent-ruby 1.3.5 introduces a change which
reveals a bug in activerecord 6.1 and 7.0, breaking specs
---
 Appraisals                        | 2 ++
 gemfiles/activerecord_6.1.gemfile | 1 +
 gemfiles/activerecord_7.0.gemfile | 1 +
 3 files changed, 4 insertions(+)

diff --git a/Appraisals b/Appraisals
index 4c40dc1..27219e5 100644
--- a/Appraisals
+++ b/Appraisals
@@ -2,10 +2,12 @@
 
 appraise "activerecord_6.1" do
   gem "activerecord", ">= 6.1.0", "< 6.2"
+  gem "concurrent-ruby", "1.3.4"
 end
 
 appraise "activerecord_7.0" do
   gem "activerecord", ">= 7.0.0", "< 7.1"
+  gem "concurrent-ruby", "1.3.4"
 end
 
 appraise "activerecord_7.1" do
diff --git a/gemfiles/activerecord_6.1.gemfile b/gemfiles/activerecord_6.1.gemfile
index 67fa50b..9f256c3 100644
--- a/gemfiles/activerecord_6.1.gemfile
+++ b/gemfiles/activerecord_6.1.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", ">= 6.1.0", "< 6.2"
+gem "concurrent-ruby", "1.3.4"
 
 gemspec path: "../"
diff --git a/gemfiles/activerecord_7.0.gemfile b/gemfiles/activerecord_7.0.gemfile
index 612f0c7..49cadf2 100644
--- a/gemfiles/activerecord_7.0.gemfile
+++ b/gemfiles/activerecord_7.0.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", ">= 7.0.0", "< 7.1"
+gem "concurrent-ruby", "1.3.4"
 
 gemspec path: "../"