Merge branch 'main' into add-invalid-search-error

Author: gregmolnar

.github/workflows/test.yml

@@ -15,8 +15,6 @@ jobs:
         rails:
           - 7-2-stable
           - v7.1.0
-          - v7.0.3
-          - v6.1.6
         ruby:
           - 3.2.2
           - 3.1.4
@@ -41,8 +39,6 @@ jobs:
         rails:
           - 7-2-stable
           - v7.1.0
-          - v7.0.3
-          - v6.1.6
         ruby:
           - 3.2.2
           - 3.1.4
@@ -76,8 +72,6 @@ jobs:
         rails:
           - 7-2-stable
           - v7.1.0
-          - v7.0.3
-          - v6.1.6
         ruby:
           - 3.2.2
           - 3.1.4

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Drop Rails 6 and 7.0 compatibility
+
 ## 4.2.1 - 2024-8-11
 
 * Fix Rails 7.1.x compatibility

README.md

@@ -13,7 +13,7 @@ There are advanced searching solutions around, like ElasticSearch or Algolia. **
 
 Ready to move beyond the basics? Use **advanced features** like i18n and extensive configuration options.
 
-Ransack is supported for Rails 7.2, 7.1, 7.0, 6.1 on Ruby 3.1 and later.
+Ransack is supported for Rails 7.2, 7.1 on Ruby 3.1 and later.
 
 ## Installation
 

lib/polyamorous/polyamorous.rb

@@ -15,7 +15,7 @@ module Polyamorous
   require 'polyamorous/activerecord/join_dependency'
   require 'polyamorous/activerecord/reflection'
 
-  if ::ActiveRecord.version >= ::Gem::Version.new("7.2")
+  if ::ActiveRecord.version >= ::Gem::Version.new("7.2") && ::ActiveRecord.version != ::Gem::Version.new("7.2.2.1")
     require "polyamorous/activerecord/join_association_7_2"
   end