Skip to content

Add Rails 7.1 support #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/super_diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
rails_appraisal:
- rails_6_1
- rails_7_0
- rails_7_1
- no_rails
rspec_appraisal:
- rspec_lt_3_10
Expand Down
14 changes: 7 additions & 7 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ rails_dependencies =
end

appraisals = {
rails_6_0:
rails_6_1:
proc do
instance_eval(&rails_dependencies)

gem 'rails', '~> 6.0.0'
gem 'rails', '~> 6.1.0'
gem 'sqlite3', '~> 1.4.0', platform: %i[ruby mswin mingw]
end,
rails_6_1:
rails_7_0:
proc do
instance_eval(&rails_dependencies)

gem 'rails', '~> 6.1.0'
gem 'rails', '~> 7.0.0'
gem 'sqlite3', '~> 1.4.0', platform: %i[ruby mswin mingw]
end,
rails_7_0:
rails_7_1:
proc do
instance_eval(&rails_dependencies)

gem 'rails', '~> 7.0.0'
gem 'rails', '~> 7.1.0'
gem 'sqlite3', '~> 1.4.0', platform: %i[ruby mswin mingw]
end,
no_rails: proc {},
Expand Down Expand Up @@ -66,7 +66,7 @@ appraisals = {
end
}

rails_appraisals = %i[no_rails rails_6_0 rails_6_1 rails_7_0]
rails_appraisals = %i[no_rails rails_6_1 rails_7_0 rails_7_1]
rspec_appraisals = %i[rspec_lt_3_10 rspec_gte_3_10 rspec_gte_3_13]

rails_appraisals.each do |rails_appraisal|
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Features

- Add official Rails 7.1 support. [#278](https://github.com/splitwise/super_diff/pull/278)

### Other changes

- Fix `logger` dependency issues in CI. [#277](https://github.com/splitwise/super_diff/pull/277)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ for more on how to do that.
`super_diff` is [tested][gh-actions] to work with
Ruby >= 3.x,
RSpec 3.x,
and Rails >= 6.x.
and Rails >= 6.1.

[gh-actions]: https://github.com/splitwise/super_diff/actions?query=workflow%3ASuperDiff

Expand Down
30 changes: 30 additions & 0 deletions gemfiles/rails_7_1_rspec_gte_3_10.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
gem "bundler-audit"
gem "childprocess"
gem "climate_control"
gem "prettier_print"
gem "pry-byebug", platform: :mri
gem "pry-nav", platform: :jruby
gem "rake"
gem "rubocop"
gem "syntax_tree"
gem "syntax_tree-haml"
gem "syntax_tree-rbs"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "jdbc-sqlite3", platform: :jruby
gem "net-ftp"
gem "combustion"
gem "rails", "~> 7.1.0"
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
gem "rspec", "3.12.0"
gem "rspec-core", "3.12.0"
gem "rspec-expectations", "3.12.3"
gem "rspec-mocks", "3.12.0"
gem "rspec-support", "3.12.0"
gem "rspec-rails"

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

source "https://rubygems.org"

gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
gem "bundler-audit"
gem "childprocess"
gem "climate_control"
gem "prettier_print"
gem "pry-byebug", platform: :mri
gem "pry-nav", platform: :jruby
gem "rake"
gem "rubocop"
gem "syntax_tree"
gem "syntax_tree-haml"
gem "syntax_tree-rbs"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "jdbc-sqlite3", platform: :jruby
gem "net-ftp"
gem "combustion"
gem "rails", "~> 7.1.0"
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
gem "rspec", "3.13.0"
gem "rspec-core", "3.13.0"
gem "rspec-expectations", "3.13.0"
gem "rspec-mocks", "3.13.0"
gem "rspec-support", "3.13.0"
gem "rspec-rails"

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

source "https://rubygems.org"

gem "appraisal", git: "https://github.com/thoughtbot/appraisal"
gem "bundler-audit"
gem "childprocess"
gem "climate_control"
gem "prettier_print"
gem "pry-byebug", platform: :mri
gem "pry-nav", platform: :jruby
gem "rake"
gem "rubocop"
gem "syntax_tree"
gem "syntax_tree-haml"
gem "syntax_tree-rbs"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "jdbc-sqlite3", platform: :jruby
gem "net-ftp"
gem "combustion"
gem "rails", "~> 7.1.0"
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
gem "rspec", "~> 3.9.0"
gem "rspec-rails"

gemspec path: "../"
Loading