Rails 7.1 support (#44)

* Rails 7.1 support

* Swap to public images

* Drop support for rails 6.0 and ruby 2.7

.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: salsify/ruby_ci:2.7.7
+      - image: cimg/ruby:3.0.6
     working_directory: ~/rails-multitenant
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-2.7.7-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-2.7.7-
+            - v1-gems-ruby-3.0.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-3.0.6-
       - run:
           name: Install Gems
           command: |
@@ -18,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-2.7.7-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-3.0.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -32,7 +32,7 @@ jobs:
       ruby_version:
         type: string
     docker:
-      - image: salsify/ruby_ci:<< parameters.ruby_version >>
+      - image: cimg/ruby:<< parameters.ruby_version >>
     environment:
       CIRCLE_TEST_REPORTS: "test-results"
       BUNDLE_GEMFILE: << parameters.gemfile >>
@@ -69,18 +69,10 @@ workflows:
           matrix:
             parameters:
               gemfile:
-              - "gemfiles/rails_6.0.gemfile"
               - "gemfiles/rails_6.1.gemfile"
               - "gemfiles/rails_7.0.gemfile"
+              - "gemfiles/rails_7.1.gemfile"
               ruby_version:
-              - "2.7.7"
-              - "3.0.5"
-              - "3.1.3"
-              - "3.2.0"
-            exclude:
-              - gemfile: "gemfiles/rails_6.0.gemfile"
-                ruby_version: "3.0.5"
-              - gemfile: "gemfiles/rails_6.0.gemfile"
-                ruby_version: "3.1.3"
-              - gemfile: "gemfiles/rails_6.0.gemfile"
-                ruby_version: "3.2.0"
+              - "3.0.6"
+              - "3.1.4"
+              - "3.2.2"

.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   salsify_rubocop: conf/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Exclude:
     - 'gemfiles/**/*'
     - 'vendor/**/*'

Appraisals

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-6.0' do
-  gem 'activerecord', '~> 6.0.6'
-  gem 'activesupport', '~> 6.0.6'
-end
-
 appraise 'rails-6.1' do
   gem 'activerecord', '~> 6.1.7'
   gem 'activesupport', '~> 6.1.7'
@@ -14,3 +9,8 @@ appraise 'rails-7.0' do
   gem 'activerecord', '~> 7.0.4'
   gem 'activesupport', '~> 7.0.4'
 end
+
+appraise 'rails-7.1' do
+  gem 'activerecord', '~> 7.1.0'
+  gem 'activesupport', '~> 7.1.0'
+end

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.19.0
+* Rails 7.1 support
+* Drop unsupported rails versions < 6.1
+* Drop unsupported ruby versions < 3.0
+
 ## 0.18.1
 * Fix issue where only direct dependencies of `Current` and `CurrentInstance` classes are cleared.
 

gemfiles/rails_5.2.gemfile → gemfiles/rails_7.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.2.4.4"
-gem "activesupport", "5.2.4.4"
+gem "activerecord", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
 
 gemspec path: "../"

lib/rails_multitenant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsMultitenant
-  VERSION = '0.18.1'
+  VERSION = '0.19.0'
 end

rails_multitenant.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['lib/**/*.rb', 'LICENSE.txt']
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.0'
 
-  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
-  spec.add_dependency 'activesupport', '>= 5.2', '< 7.1'
+  spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
+  spec.add_dependency 'activesupport', '>= 6.1', '< 7.2'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'coveralls'