Skip to content

Commit

Permalink
Merge pull request #300 from enriclluelles/feature/rails-71-compatibi…
Browse files Browse the repository at this point in the history
…lity

Rails 7.1 compatibility
  • Loading branch information
tagliala authored Oct 5, 2023
2 parents 7663476 + fed1480 commit ba446a0
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 40 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
ruby-version: ['2.7', '3.0', '3.1', '3.2']
gemfile: [rails_6.1, rails_7.0]
gemfile: [rails_6.1, rails_7.0, rails_7.1]
channel: ['stable']

include:
Expand All @@ -35,6 +35,9 @@ jobs:
- ruby-version: 'head'
gemfile: rails_7.0
channel: 'experimental'
- ruby-version: 'head'
gemfile: rails_7.1
channel: 'experimental'
- ruby-version: 'head'
gemfile: rails_edge
channel: 'experimental'
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ appraise 'rails-7.0' do
gem 'rails', '~> 7.0.0'
end

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

appraise 'rails-edge' do
gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'main'
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 14.1.0 / 2023-10-05

* [FEATURE] Rails 7.1 compatibility

## 14.0.1 / 2023-09-03

* [BUGFIX] Fix eager load on booting ([#296](https://github.com/enriclluelles/route_translator/issues/296))
Expand Down
24 changes: 12 additions & 12 deletions gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

source "https://rubygems.org"

gem "appraisal", "~> 2.4"
gem "byebug", "~> 11.1"
gem "minitest", "~> 5.19"
gem "appraisal"
gem "byebug"
gem "minitest"
gem "rails", "~> 6.1.0"
gem "rake", "~> 13.0"
gem "rubocop", "~> 1.56"
gem "rubocop-minitest", "~> 0.31.0"
gem "rubocop-packaging", "~> 0.5.2"
gem "rubocop-performance", "~> 1.19"
gem "rubocop-rails", "~> 2.20"
gem "rubocop-rake", "~> 0.6.0"
gem "simplecov", "~> 0.22.0"
gem "simplecov-lcov", "~> 0.8.0"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "simplecov"
gem "simplecov-lcov"

gemspec path: "../"
24 changes: 12 additions & 12 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

source "https://rubygems.org"

gem "appraisal", "~> 2.4"
gem "byebug", "~> 11.1"
gem "minitest", "~> 5.19"
gem "appraisal"
gem "byebug"
gem "minitest"
gem "rails", "~> 7.0.0"
gem "rake", "~> 13.0"
gem "rubocop", "~> 1.56"
gem "rubocop-minitest", "~> 0.31.0"
gem "rubocop-packaging", "~> 0.5.2"
gem "rubocop-performance", "~> 1.19"
gem "rubocop-rails", "~> 2.20"
gem "rubocop-rake", "~> 0.6.0"
gem "simplecov", "~> 0.22.0"
gem "simplecov-lcov", "~> 0.8.0"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "simplecov"
gem "simplecov-lcov"

gemspec path: "../"
19 changes: 19 additions & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "byebug"
gem "minitest"
gem "rails", "~> 7.1.0"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "simplecov"
gem "simplecov-lcov"

gemspec path: "../"
24 changes: 12 additions & 12 deletions gemfiles/rails_edge.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

source "https://rubygems.org"

gem "appraisal", "~> 2.4"
gem "byebug", "~> 11.1"
gem "minitest", "~> 5.19"
gem "appraisal"
gem "byebug"
gem "minitest"
gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
gem "rake", "~> 13.0"
gem "rubocop", "~> 1.56"
gem "rubocop-minitest", "~> 0.31.0"
gem "rubocop-packaging", "~> 0.5.2"
gem "rubocop-performance", "~> 1.19"
gem "rubocop-rails", "~> 2.20"
gem "rubocop-rake", "~> 0.6.0"
gem "simplecov", "~> 0.22.0"
gem "simplecov-lcov", "~> 0.8.0"
gem "rake"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rake"
gem "simplecov"
gem "simplecov-lcov"

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

module RouteTranslator
VERSION = '14.0.1'
VERSION = '14.1.0'
end
4 changes: 2 additions & 2 deletions route_translator.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 2.7'

spec.add_runtime_dependency 'actionpack', '>= 6.1', '< 7.1'
spec.add_runtime_dependency 'activesupport', '>= 6.1', '< 7.1'
spec.add_runtime_dependency 'actionpack', '>= 6.1', '< 7.2'
spec.add_runtime_dependency 'activesupport', '>= 6.1', '< 7.2'
end

0 comments on commit ba446a0

Please sign in to comment.