Remove support for Rails 6.0

zendesk · Oct 12, 2023 · 4cccae7 · 4cccae7
1 parent 44a4c9f
commit 4cccae7
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 104 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,8 +43,6 @@ jobs:
         legacy_connection_handling:
           - "false"
           - "true"
-        include:
-          - {ruby-version: "2.7", gemfile: rails6.0, legacy_connection_handling: "false"}
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       LEGACY_CONNECTION_HANDLING: "${{ matrix.legacy_connection_handling }}"

diff --git a/Changelog.md b/Changelog.md
@@ -8,7 +8,7 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 - `Trilogy` is now a supported MySQL database adapter. ActiveRecordHostPool no longer requires `mysql2`, nor does it explicitly require `activerecord-trilogy-adapter`. Applications using ARHP will now need to explicitly require one of these adapters in its gemfile. When using `activerecord-trilogy-adapter` also ensure that the `trilogy` gem is locked to `v2.5.0+`.
 - Remove `mysql2` as a direct dependency, test Rails 7.0 with `mysql2` and `activerecord-trilogy-adapter`.
-- Remove support for Rails 5.1 and 5.2
+- Remove support for Rails 5.1, 5.2, and 6.0.
 
 ## [1.2.5] - 2023-07-14
 ### Added

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-eval_gemfile 'gemfiles/rails6.0.gemfile'
+eval_gemfile 'gemfiles/rails6.1.gemfile'
diff --git a/Readme.md b/Readme.md
@@ -62,11 +62,11 @@ You need a local user called 'john-doe'.
 
 With mysql running locally, run
 
-    BUNDLE_GEMFILE=gemfiles/rails6.0.gemfile bundle exec rake test
+    BUNDLE_GEMFILE=gemfiles/rails6.1.gemfile bundle exec rake test
 
  Or
 
-    BUNDLE_GEMFILE=gemfiles/rails6.0.gemfile ruby test/test_arhp.rb --seed 19911 --verbose
+    BUNDLE_GEMFILE=gemfiles/rails6.1.gemfile ruby test/test_arhp.rb --seed 19911 --verbose
 
 ## Copyright
 

diff --git a/active_record_host_pool.gemspec b/active_record_host_pool.gemspec
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.7.0"
 
-  s.add_runtime_dependency("activerecord", ">= 6.0.0", "< 7.1")
+  s.add_runtime_dependency("activerecord", ">= 6.1.0", "< 7.1")
 end
diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile
diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 6.0.0, < 7.1)
+      activerecord (>= 6.1.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails7.0_mysql2.gemfile.lock b/gemfiles/rails7.0_mysql2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 6.0.0, < 7.1)
+      activerecord (>= 6.1.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails7.0_trilogy.gemfile.lock b/gemfiles/rails7.0_trilogy.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 6.0.0, < 7.1)
+      activerecord (>= 6.1.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/