From 4ec650a84aab94c60d8a86109f8ff1fe154fd8e5 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Wed, 15 Dec 2021 17:23:11 -0800
Subject: [PATCH] Test with Active Record 7 by default

---
 .github/workflows/build.yml     |  3 +++
 Gemfile                         |  6 +++---
 gemfiles/activerecord61.gemfile | 15 +++++++++++++++
 gemfiles/activerecord70.gemfile | 15 ---------------
 gemfiles/opensearch.gemfile     |  6 +++---
 5 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 gemfiles/activerecord61.gemfile
 delete mode 100644 gemfiles/activerecord70.gemfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25bd8cc..6682a08 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,9 @@ jobs:
           gemfile: Gemfile
           elasticsearch: 7.16.1
         - ruby: 3.0
+          gemfile: gemfiles/activerecord61.gemfile
+          elasticsearch: 7.16.1
+        - ruby: 3.0
           gemfile: gemfiles/opensearch.gemfile
           opensearch: 1.2.1
         - ruby: 2.7
diff --git a/Gemfile b/Gemfile
index 2a00c7d..c88196d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,9 @@ gemspec
 
 gem "rake"
 gem "minitest", ">= 5"
-gem "activerecord", "~> 6.1.0"
-gem "activejob", "~> 6.1.0", require: "active_job"
-gem "actionpack", "~> 6.1.0"
+gem "activerecord", "~> 7.0.0"
+gem "activejob", "~> 7.0.0", require: "active_job"
+gem "actionpack", "~> 7.0.0"
 gem "sqlite3"
 gem "gemoji-parser"
 gem "typhoeus"
diff --git a/gemfiles/activerecord61.gemfile b/gemfiles/activerecord61.gemfile
new file mode 100644
index 0000000..f47ac5e
--- /dev/null
+++ b/gemfiles/activerecord61.gemfile
@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rake"
+gem "minitest", ">= 5"
+gem "sqlite3"
+gem "activerecord", "~> 6.1.0"
+gem "actionpack", "~> 6.1.0"
+gem "activejob", "~> 6.1.0", require: "active_job"
+gem "elasticsearch", "~> 7"
+gem "redis"
+gem "connection_pool"
+gem "kaminari"
+gem "gemoji-parser"
diff --git a/gemfiles/activerecord70.gemfile b/gemfiles/activerecord70.gemfile
deleted file mode 100644
index f12079e..0000000
--- a/gemfiles/activerecord70.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rake"
-gem "minitest", ">= 5"
-gem "sqlite3"
-gem "activerecord", "~> 7.0.0.rc1"
-gem "actionpack", "~> 7.0.0.rc1"
-gem "activejob", "~> 7.0.0.rc1", require: "active_job"
-gem "elasticsearch", "~> 7"
-gem "redis"
-gem "connection_pool"
-gem "kaminari"
-gem "gemoji-parser"
diff --git a/gemfiles/opensearch.gemfile b/gemfiles/opensearch.gemfile
index 4cfd029..9b4112b 100644
--- a/gemfiles/opensearch.gemfile
+++ b/gemfiles/opensearch.gemfile
@@ -4,9 +4,9 @@ gemspec path: ".."
 
 gem "rake"
 gem "minitest", ">= 5"
-gem "activerecord", "~> 6.1.0"
-gem "activejob", "~> 6.1.0", require: "active_job"
-gem "actionpack", "~> 6.1.0"
+gem "activerecord", "~> 7.0.0"
+gem "activejob", "~> 7.0.0", require: "active_job"
+gem "actionpack", "~> 7.0.0"
 gem "sqlite3"
 gem "gemoji-parser"
 gem "typhoeus"
--
libgit2 0.21.0