From 96ddaf0799eda8a4bd6c26263f50534443b3bcff Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <seuros@commonshare.com>
Date: Sun, 29 Oct 2023 17:48:26 +0100
Subject: [PATCH] test AR 7.1

---
 .github/workflows/ci.yml       |  1 -
 .github/workflows/ci_jruby.yml |  1 +
 .tool-versions                 |  2 +-
 Appraisals                     | 22 +++++++++-------------
 closure_tree.gemspec           | 15 ++++++++-------
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 99128c0..e4bdd10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,6 @@ jobs:
         rails:
           - activerecord_7.0
           - activerecord_6.1
-          - activerecord_6.0
         adapter:
           - 'sqlite3:///:memory:'
           - mysql2://root:root@0/closure_tree_test
diff --git a/.github/workflows/ci_jruby.yml b/.github/workflows/ci_jruby.yml
index 9a64904..2ff3296 100644
--- a/.github/workflows/ci_jruby.yml
+++ b/.github/workflows/ci_jruby.yml
@@ -37,6 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         rails:
+          - activerecord_7.1
           - activerecord_7.0
           - activerecord_6.1
         adapter:
diff --git a/.tool-versions b/.tool-versions
index 5de817e..d6608a7 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-ruby 3.0.5
+ruby 3.0.6
diff --git a/Appraisals b/Appraisals
index 38e88ba..87e2bba 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.0'
+appraise 'activerecord-6.1' do
+  gem 'activerecord', '~> 6.1.0'
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
@@ -15,8 +15,8 @@ appraise 'activerecord-6.0' do
   end
 end
 
-appraise 'activerecord-6.1' do
-  gem 'activerecord', '~> 6.1.0'
+appraise 'activerecord-7.0' do
+  gem 'activerecord', '~> 7.0.0'
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
@@ -30,18 +30,14 @@ appraise 'activerecord-6.1' do
   end
 end
 
-appraise 'activerecord-7.0' do
-  gem 'activerecord', '~> 7.0.0'
+
+appraise 'activerecord-7.1' do
+  gem 'activerecord', '~> 7.1.0'
   platforms :ruby do
+    gem 'sqlite3'
     gem 'mysql2'
+    gem 'trilogy'
     gem 'pg'
-    gem 'sqlite3'
-  end
-
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'activerecord-jdbcsqlite3-adapter'
   end
 end
 
diff --git a/closure_tree.gemspec b/closure_tree.gemspec
index 7eac8db..d46bc9f 100644
--- a/closure_tree.gemspec
+++ b/closure_tree.gemspec
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 require_relative 'lib/closure_tree/version'
 
 Gem::Specification.new do |gem|
@@ -9,26 +10,26 @@ Gem::Specification.new do |gem|
   gem.email       = %w[matthew+github@mceachen.org terminale@gmail.com]
   gem.homepage    = 'https://github.com/ClosureTree/closure_tree/'
 
-  gem.summary     = %q(Easily and efficiently make your ActiveRecord model support hierarchies)
+  gem.summary     = 'Easily and efficiently make your ActiveRecord model support hierarchies'
   gem.description = gem.summary
   gem.license     = 'MIT'
 
-  gem.files         = `git ls-files`.split($/).reject do |f|
-    f.match(%r{^(spec|img|gemfiles)})
+  gem.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR).reject do |f|
+    f.match(/^(spec|img|gemfiles)/)
   end
 
-  gem.test_files  = gem.files.grep(%r{^spec/})
+  gem.test_files = gem.files.grep(%r{^spec/})
   gem.required_ruby_version = '>= 2.7.7'
 
-  gem.add_runtime_dependency 'activerecord', '>= 6.0.0'
-  gem.add_runtime_dependency 'with_advisory_lock', '>= 4.0.0'
+  gem.add_runtime_dependency 'activerecord', '>= 6.1.0'
+  gem.add_runtime_dependency 'with_advisory_lock', '>= 5.0.0'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'generator_spec'
-  gem.add_development_dependency 'parallel'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'minitest-reporters'
+  gem.add_development_dependency 'parallel'
   gem.add_development_dependency 'rspec-instafail'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'simplecov'