diff --git a/.github/workflows/super_diff.yml b/.github/workflows/super_diff.yml index 49ba8af8..cff9f8ee 100644 --- a/.github/workflows/super_diff.yml +++ b/.github/workflows/super_diff.yml @@ -61,6 +61,7 @@ jobs: rails_appraisal: - rails_6_1 - rails_7_0 + - rails_7_1 - no_rails rspec_appraisal: - rspec_lt_3_10 diff --git a/Appraisals b/Appraisals index e7a828f2..180dd2b4 100644 --- a/Appraisals +++ b/Appraisals @@ -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 {}, @@ -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| diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c9db249..301f6477 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/README.md b/README.md index d7a3bff5..cb2211f4 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/gemfiles/rails_7_1_rspec_gte_3_10.gemfile b/gemfiles/rails_7_1_rspec_gte_3_10.gemfile new file mode 100644 index 00000000..e57a2b74 --- /dev/null +++ b/gemfiles/rails_7_1_rspec_gte_3_10.gemfile @@ -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: "../" diff --git a/gemfiles/rails_7_1_rspec_gte_3_13.gemfile b/gemfiles/rails_7_1_rspec_gte_3_13.gemfile new file mode 100644 index 00000000..6e8a9f43 --- /dev/null +++ b/gemfiles/rails_7_1_rspec_gte_3_13.gemfile @@ -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: "../" diff --git a/gemfiles/rails_7_1_rspec_lt_3_10.gemfile b/gemfiles/rails_7_1_rspec_lt_3_10.gemfile new file mode 100644 index 00000000..4e714f6d --- /dev/null +++ b/gemfiles/rails_7_1_rspec_lt_3_10.gemfile @@ -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: "../"