DEV: Add official compatibility with Rails 8.0+

.github/workflows/ci.yml

@@ -16,13 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
-        rails: ["6.1", "7.0", "7.1", "7.2", "edge"]
-        exclude:
-          - ruby: "3.4"
-            rails: "6.1"
-          - ruby: "3.4"
-            rails: "7.0"
+        ruby: ["3.2", "3.3", "3.4"]
+        rails: ["7.1", "7.2", "8.0", "edge"]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.0.0] - 2025-07-22
+
+### Added
+
+- Support for Rails 8.0+
+- Bump minimum Ruby support to >= 3.2 since Ruby 3.1 is EOL.
+- Bump minimum Rails support to >= 7.1 since Rails 7.0 is EOL.
+
 ## [6.1.0] - 2024-08-13
 
 ### Added

gemfiles/rails_6.1.gemfile → gemfiles/rails_8.0.gemfile

@@ -2,10 +2,10 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'activerecord', '> 6', '< 7'
-  gem 'railties', '> 6', '< 7'
+  gem 'activerecord', '~> 8.0.0'
+  gem 'railties', '~> 8.0.0'
   gem 'rspec'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3'
   gem 'byebug'
   gem 'rubocop'
   gem 'rubocop-discourse'

lib/rails_multisite/connection_management.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-if Rails.version >= "6.1"
-  require "rails_multisite/connection_management/rails_61_compat"
-else
-  require "rails_multisite/connection_management/rails_60_compat"
-end
+require "rails_multisite/connection_management/connection_specification"
 require "rails_multisite/connection_management/null_instance"
 
 module RailsMultisite

lib/rails_multisite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 #
 module RailsMultisite
-  VERSION = "6.1.0"
+  VERSION = "7.0.0"
 end

rails_multisite.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = RailsMultisite::VERSION
 
-  gem.required_ruby_version = ">=3.1"
+  gem.required_ruby_version = ">=3.2"
 
-  gem.add_dependency "activerecord", ">= 6.0"
-  gem.add_dependency "railties", ">= 6.0"
+  gem.add_dependency "activerecord", ">= 7.1"
+  gem.add_dependency "railties", ">= 7.1"
 end

spec/spec_helper.rb

@@ -32,16 +32,11 @@ def fixture_path(name)
   end
 
   def load_db_config(name)
-    if defined?(ActiveRecord::DatabaseConfigurations)
-      configs = ActiveRecord::DatabaseConfigurations.new(YAML.safe_load(File.open(fixture_path(name))))
-      ActiveRecord::Base.configurations = configs
-    else
-      ActiveRecord::Base.configurations = YAML.safe_load(File.open(fixture_path(name)))
-    end
+    configs = ActiveRecord::DatabaseConfigurations.new(YAML.safe_load(File.open(fixture_path(name))))
+    ActiveRecord::Base.configurations = configs
   end
 
   config.before(:suite) do
     load_db_config("database.yml")
-    ActiveRecord.legacy_connection_handling = false if ActiveRecord.respond_to?(:legacy_connection_handling)
   end
 end