test ActiveRecord 7.1

.github/workflows/ci.yml

@@ -9,6 +9,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ci-${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   rspec:
     runs-on: ubuntu-latest
@@ -44,7 +48,6 @@ jobs:
         rails:
           - activerecord_7.0
           - activerecord_6.1
-          - activerecord_6.0
         adapter:
           - 'sqlite3:///:memory:'
           - mysql2://root:root@0/closure_tree_test

.github/workflows/ci_jruby.yml

@@ -8,6 +8,9 @@ on:
   pull_request:
     branches:
       - master
+concurrency:
+  group: ci-${{ github.head_ref }}
+  cancel-in-progress: true
 
 jobs:
   rspec:
@@ -37,6 +40,7 @@ jobs:
       fail-fast: false
       matrix:
         rails:
+          - activerecord_7.1
           - activerecord_7.0
           - activerecord_6.1
         adapter:

.github/workflows/ci_truffleruby.yml

@@ -9,6 +9,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ci-${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
   rspec:
     runs-on: ubuntu-latest

.tool-versions

@@ -1 +1 @@
-ruby 3.0.5
+ruby 3.0.6

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
 

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[[email protected] [email protected]]
   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'

gemfiles/activerecord_6.0.gemfile → gemfiles/activerecord_7.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0"
+gem "activerecord", "~> 7.1.0"
 
 platforms :mri do
   group :development do
@@ -12,15 +12,10 @@ platforms :mri do
 end
 
 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
 
 gemspec path: "../"