Skip to content

Commit

Permalink
Rails 7.2 support (#47)
Browse files Browse the repository at this point in the history
* Rails 7.2 support

* Drop Rails 6.1 support
Update ruby versions to latest maintenance release

* Update changelog

* Update config.yml ruby version

* Update rails versions to latest maintenance release

* Fix target ruby version and linting
  • Loading branch information
MrAsler authored Oct 16, 2024
1 parent 2415495 commit 774107b
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 26 deletions.
17 changes: 8 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ version: 2.1
jobs:
lint:
docker:
- image: cimg/ruby:3.0.6
- image: cimg/ruby:3.1.6
working_directory: ~/rails-multitenant
steps:
- checkout
- restore_cache:
keys:
- v1-gems-ruby-3.0.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
- v1-gems-ruby-3.0.6-
- v1-gems-ruby-3.1.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
- v1-gems-ruby-3.1.6-
- run:
name: Install Gems
command: |
Expand All @@ -18,7 +18,7 @@ jobs:
bundle clean
fi
- save_cache:
key: v1-gems-ruby-3.0.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
key: v1-gems-ruby-3.1.6-{{ checksum "rails_multitenant.gemspec" }}-{{ checksum "Gemfile" }}
paths:
- "vendor/bundle"
- "gemfiles/vendor/bundle"
Expand Down Expand Up @@ -69,11 +69,10 @@ workflows:
matrix:
parameters:
gemfile:
- gemfiles/rails_6.1.gemfile
- gemfiles/rails_7.0.gemfile
- gemfiles/rails_7.1.gemfile
- gemfiles/rails_7.2.gemfile
ruby_version:
- 3.0.6
- 3.1.4
- 3.2.2
- 3.3.0
- 3.1.6
- 3.2.5
- 3.3.5
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ inherit_gem:
salsify_rubocop: conf/rubocop.yml

AllCops:
TargetRubyVersion: 3.0
TargetRubyVersion: 3.1
Exclude:
- 'gemfiles/**/*'
- 'vendor/**/*'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.7
3.3.0
18 changes: 9 additions & 9 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# frozen_string_literal: true

appraise 'rails-6.1' do
gem 'activerecord', '~> 6.1.7'
gem 'activesupport', '~> 6.1.7'
end

appraise 'rails-7.0' do
gem 'activerecord', '~> 7.0.4'
gem 'activesupport', '~> 7.0.4'
gem 'activerecord', '~> 7.0.8'
gem 'activesupport', '~> 7.0.8'
end

appraise 'rails-7.1' do
gem 'activerecord', '~> 7.1.0'
gem 'activesupport', '~> 7.1.0'
gem 'activerecord', '~> 7.1.4'
gem 'activesupport', '~> 7.1.4'
end

appraise 'rails-7.2' do
gem 'activerecord', '~> 7.2.1'
gem 'activesupport', '~> 7.2.1'
end
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 0.20.0
* Rails 7.2 support
* Drop unsupported rails version 6.1
* Drop unsupported ruby 3.0

## 0.19.0
* Rails 7.1 support
* Drop unsupported rails versions < 6.1
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_6.1.gemfile → gemfiles/rails_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "activerecord", "~> 6.1.7"
gem "activesupport", "~> 6.1.7"
gem "activerecord", "~> 7.2.1"
gem "activesupport", "~> 7.2.1"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/rails_multitenant/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module RailsMultitenant
VERSION = '0.19.0'
VERSION = '0.20.0'
end
6 changes: 3 additions & 3 deletions rails_multitenant.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
spec.files = Dir['lib/**/*.rb', 'LICENSE.txt']
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 3.0'
spec.required_ruby_version = '>= 3.1'

spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
spec.add_dependency 'activesupport', '>= 6.1', '< 7.2'
spec.add_dependency 'activerecord', '>= 7.0', '< 7.3'
spec.add_dependency 'activesupport', '>= 7.0', '< 7.3'

spec.add_development_dependency 'appraisal'
spec.add_development_dependency 'coveralls'
Expand Down

0 comments on commit 774107b

Please sign in to comment.