From 11f1832aee1b872cc50a9fbedce9876d38b468d3 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Thu, 5 Oct 2023 19:52:46 -0700
Subject: [PATCH] Test with Rails 7.1

---
 .github/workflows/build.yml                                 | 4 ++--
 Gemfile                                                     | 2 +-
 gemfiles/{activerecord71.gemfile => activerecord70.gemfile} | 2 +-
 gemfiles/mysql2.gemfile                                     | 2 +-
 gemfiles/sqlite3.gemfile                                    | 2 +-
 gemfiles/trilogy.gemfile                                    | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename gemfiles/{activerecord71.gemfile => activerecord70.gemfile} (75%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d20e71e..7e21090 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,10 +8,10 @@ jobs:
       matrix:
         include:
           - ruby: 3.2
-            gemfile: gemfiles/activerecord71.gemfile
+            gemfile: Gemfile
             postgres: true
           - ruby: 3.1
-            gemfile: Gemfile
+            gemfile: gemfiles/activerecord70.gemfile
             postgres: true
           - ruby: "3.0"
             gemfile: gemfiles/activerecord61.gemfile
diff --git a/Gemfile b/Gemfile
index 59994c0..7df27d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.1.0"
 gem "minitest"
 gem "pg"
 gem "rake"
diff --git a/gemfiles/activerecord71.gemfile b/gemfiles/activerecord70.gemfile
similarity index 75%
rename from gemfiles/activerecord71.gemfile
rename to gemfiles/activerecord70.gemfile
index 629717a..8fa7537 100644
--- a/gemfiles/activerecord71.gemfile
+++ b/gemfiles/activerecord70.gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "activerecord", "7.1.0.beta1"
+gem "activerecord", "~> 7.0.0"
 gem "minitest"
 gem "pg"
 gem "rake"
diff --git a/gemfiles/mysql2.gemfile b/gemfiles/mysql2.gemfile
index c7d9108..5f48f8b 100644
--- a/gemfiles/mysql2.gemfile
+++ b/gemfiles/mysql2.gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.1.0"
 gem "minitest"
 gem "mysql2"
 gem "rake"
diff --git a/gemfiles/sqlite3.gemfile b/gemfiles/sqlite3.gemfile
index c380114..c2d6aae 100644
--- a/gemfiles/sqlite3.gemfile
+++ b/gemfiles/sqlite3.gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.1.0"
 gem "minitest"
 gem "sqlite3"
 gem "rake"
diff --git a/gemfiles/trilogy.gemfile b/gemfiles/trilogy.gemfile
index e6b46d4..831302d 100644
--- a/gemfiles/trilogy.gemfile
+++ b/gemfiles/trilogy.gemfile
@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.1.0"
 gem "minitest"
-gem "activerecord-trilogy-adapter"
+gem "trilogy"
 gem "rake"
 gem "groupdate", ">= 6.4"