Merge pull request #752 from kbrock/drop_trilogy_adapter_gem

Remove deprecated activerecord-trilogy-adapter from Appraisals

Author: kbrock

Appraisals

@@ -7,9 +7,9 @@
   appraise "gemfile-#{ar_version.split('.').first(2).join}" do
     gem 'activerecord', "~> #{ar_version}"
     # so we are targeting the ruby version indirectly through active record
-    # trilogy adapter is built into Rails 7.1+; older versions need the gem
+    # concurrent-ruby 1.3.5+ breaks Rails < 7.1
     if ar_version < "7.1"
-      gem "activerecord-trilogy-adapter"
+      gem "concurrent-ruby", "< 1.3.5"
     end
     if ar_version < "7.0"
       gem "sqlite3", "~> 1.6.9"

gemfiles/gemfile_60.gemfile

@@ -1,10 +1,10 @@
 # This file was generated by Appraisal
-# frozen_string_literal: true
 
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.0.6"
 gem "mysql2"
+gem "trilogy"
 gem "pg"
 gem "sqlite3", "~> 1.6.9"
 gem "concurrent-ruby", "< 1.3.5"

gemfiles/gemfile_61.gemfile

@@ -1,10 +1,10 @@
 # This file was generated by Appraisal
-# frozen_string_literal: true
 
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.7"
 gem "mysql2"
+gem "trilogy"
 gem "pg"
 gem "sqlite3", "~> 1.6.9"
 gem "concurrent-ruby", "< 1.3.5"

gemfiles/gemfile_70.gemfile

@@ -1,10 +1,10 @@
 # This file was generated by Appraisal
-# frozen_string_literal: true
 
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.8"
 gem "mysql2"
+gem "trilogy"
 gem "pg"
 gem "sqlite3", "< 2.0"
 gem "concurrent-ruby", "< 1.3.5"

gemfiles/gemfile_71.gemfile

@@ -1,10 +1,10 @@
 # This file was generated by Appraisal
-# frozen_string_literal: true
 
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.1.3"
 gem "mysql2"
+gem "trilogy"
 gem "pg"
 gem "sqlite3", "< 2.0"
 

gemfiles/gemfile_72.gemfile

@@ -1,5 +1,4 @@
 # This file was generated by Appraisal
-# frozen_string_literal: true
 
 source "https://rubygems.org"
 

gemfiles/gemfile_80.gemfile

@@ -1,11 +1,11 @@
 # This file was generated by Appraisal
-# frozen_string_literal: true
 
 source "https://rubygems.org"
 
 gem "activerecord", "~> 8.0.0"
 gem "mysql2"
+gem "trilogy"
 gem "pg"
 gem "sqlite3", ">= 2.1"
 
-gemspec path: "../"
+gemspec path: "../"