From c93c592ecfb8a1d98d6a97da376e982aa1403690 Mon Sep 17 00:00:00 2001
From: Nicholas Lee <nicholas.lee@appfolio.com>
Date: Mon, 27 Mar 2023 11:53:05 -0700
Subject: [PATCH] Updates for Ruby `2.7.7`, `3.1.3`, `3.2.1`

---
 .circleci/config.yml                       |  6 ++--
 .gitignore                                 | 35 +++++++---------------
 .ruby_version                              |  2 +-
 Appraisals                                 | 14 +--------
 Gemfile                                    | 12 ++++----
 LICENSE.txt                                |  2 +-
 gemfiles/ruby_2.6.9_activerecord60.gemfile | 17 -----------
 gemfiles/ruby_2.6.9_activerecord61.gemfile | 17 -----------
 gemfiles/ruby_2.7.5_activerecord60.gemfile | 17 -----------
 gemfiles/ruby_2.7.5_activerecord61.gemfile | 17 -----------
 gemfiles/ruby_2.7.5_activerecord70.gemfile | 17 -----------
 gemfiles/ruby_3.1.0_activerecord60.gemfile | 17 -----------
 gemfiles/ruby_3.1.0_activerecord61.gemfile | 17 -----------
 gemfiles/ruby_3.1.0_activerecord70.gemfile | 17 -----------
 14 files changed, 22 insertions(+), 185 deletions(-)
 delete mode 100644 gemfiles/ruby_2.6.9_activerecord60.gemfile
 delete mode 100644 gemfiles/ruby_2.6.9_activerecord61.gemfile
 delete mode 100644 gemfiles/ruby_2.7.5_activerecord60.gemfile
 delete mode 100644 gemfiles/ruby_2.7.5_activerecord61.gemfile
 delete mode 100644 gemfiles/ruby_2.7.5_activerecord70.gemfile
 delete mode 100644 gemfiles/ruby_3.1.0_activerecord60.gemfile
 delete mode 100644 gemfiles/ruby_3.1.0_activerecord61.gemfile
 delete mode 100644 gemfiles/ruby_3.1.0_activerecord70.gemfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e70a19e..b57bfed 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@ workflows:
           matrix:
             parameters:
               ruby_version:
-                - '3.1.0'
-                - '2.7.5'
-                - '2.6.9'
+                - '3.2.1'
+                - '3.1.3'
+                - '2.7.7'
           after-appraisal-install-steps:
             - gem-tool/wait_mysql
diff --git a/.gitignore b/.gitignore
index 3fc39b8..1db9a10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,12 @@
-*.gem
-*.rbc
-.bundle
-.config
-.DS_STORE
-.idea
-db
-debug.log
-coverage
-Gemfile.lock
-gemfiles/*.lock
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-storebasestiname_unittest.sql
-test/tmp
-test/version_tmp
-tmp
+/.bundle/
+/coverage/
+/pkg/
+/tmp/
 
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+# Only generate Appraisal gemfiles on CI
+/gemfiles/
 
-test/test.log
+# Ignore generated files
+Gemfile.lock
+*.log
+*.gem
diff --git a/.ruby_version b/.ruby_version
index 872e120..72b3400 100644
--- a/.ruby_version
+++ b/.ruby_version
@@ -1 +1 @@
-ruby-3.1.0
+ruby-3.2.1
diff --git a/Appraisals b/Appraisals
index 101c802..39d50f2 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,19 +1,7 @@
 # frozen_string_literal: true
 
 case RUBY_VERSION
-when '2.6.9'
-  appraise "ruby-#{RUBY_VERSION}_activerecord60" do
-    source 'https://rubygems.org' do
-      gem 'activerecord', '~> 6.0.0'
-    end
-  end
-
-  appraise "ruby-#{RUBY_VERSION}_activerecord61" do
-    source 'https://rubygems.org' do
-      gem 'activerecord', '~> 6.1.0'
-    end
-  end
-when '2.7.5', '3.1.0'
+when '2.7.7', '3.1.3', '3.2.1'
   appraise "ruby-#{RUBY_VERSION}_activerecord60" do
     source 'https://rubygems.org' do
       gem 'activerecord', '~> 6.0.0'
diff --git a/Gemfile b/Gemfile
index 3d19cc4..9a780a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,14 +3,14 @@
 source 'https://rubygems.org' # global source
 
 source 'https://rubygems.org' do
-  gem 'activesupport', '>= 4.2', '< 7.1'
-  gem 'appraisal', '>= 2.3', '< 3'
+  gem 'activesupport', '>= 6', '< 7.1'
+  gem 'appraisal', '>= 2.4', '< 3'
   gem 'bundler', '>= 2.2', '< 3'
-  gem 'minitest', '>= 5.15', '< 6'
-  gem 'minitest-reporters', '>= 1.4', '< 2'
-  gem 'mysql2', '>= 0.5.2', '< 1'
+  gem 'minitest', '>= 5.18', '< 6'
+  gem 'minitest-reporters', '>= 1.6', '< 2'
+  gem 'mysql2', '>= 0.5.5', '< 1'
   gem 'rake', '>= 13', '< 14'
-  gem 'simplecov', '>= 0.21', '< 1', group: :test, require: false
+  gem 'simplecov', '>= 0.22', '< 1', group: :test, require: false
 end
 
 gemspec
diff --git a/LICENSE.txt b/LICENSE.txt
index 62fbb82..b518124 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2022 AppFolio, Inc
+Copyright (c) 2011-2023 AppFolio, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/gemfiles/ruby_2.6.9_activerecord60.gemfile b/gemfiles/ruby_2.6.9_activerecord60.gemfile
deleted file mode 100644
index 9d5e5cc..0000000
--- a/gemfiles/ruby_2.6.9_activerecord60.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 6.0.0"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/ruby_2.6.9_activerecord61.gemfile b/gemfiles/ruby_2.6.9_activerecord61.gemfile
deleted file mode 100644
index db3909b..0000000
--- a/gemfiles/ruby_2.6.9_activerecord61.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 6.1.0"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/ruby_2.7.5_activerecord60.gemfile b/gemfiles/ruby_2.7.5_activerecord60.gemfile
deleted file mode 100644
index 9d5e5cc..0000000
--- a/gemfiles/ruby_2.7.5_activerecord60.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 6.0.0"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/ruby_2.7.5_activerecord61.gemfile b/gemfiles/ruby_2.7.5_activerecord61.gemfile
deleted file mode 100644
index db3909b..0000000
--- a/gemfiles/ruby_2.7.5_activerecord61.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 6.1.0"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/ruby_2.7.5_activerecord70.gemfile b/gemfiles/ruby_2.7.5_activerecord70.gemfile
deleted file mode 100644
index 96ff76d..0000000
--- a/gemfiles/ruby_2.7.5_activerecord70.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 7.0.0"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/ruby_3.1.0_activerecord60.gemfile b/gemfiles/ruby_3.1.0_activerecord60.gemfile
deleted file mode 100644
index 9d5e5cc..0000000
--- a/gemfiles/ruby_3.1.0_activerecord60.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 6.0.0"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/ruby_3.1.0_activerecord61.gemfile b/gemfiles/ruby_3.1.0_activerecord61.gemfile
deleted file mode 100644
index db3909b..0000000
--- a/gemfiles/ruby_3.1.0_activerecord61.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 6.1.0"
-end
-
-gemspec path: "../"
diff --git a/gemfiles/ruby_3.1.0_activerecord70.gemfile b/gemfiles/ruby_3.1.0_activerecord70.gemfile
deleted file mode 100644
index 96ff76d..0000000
--- a/gemfiles/ruby_3.1.0_activerecord70.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-source "https://rubygems.org" do
-  gem "activesupport", ">= 4.2", "< 7.1"
-  gem "appraisal", ">= 2.3", "< 3"
-  gem "bundler", ">= 2.2", "< 3"
-  gem "minitest", ">= 5.15", "< 6"
-  gem "minitest-reporters", ">= 1.4", "< 2"
-  gem "mysql2", ">= 0.5.2", "< 1"
-  gem "rake", ">= 13", "< 14"
-  gem "simplecov", ">= 0.21", "< 1", group: :test, require: false
-  gem "activerecord", "~> 7.0.0"
-end
-
-gemspec path: "../"