Merge branch 'master' into deep_merge-require-core-only

.gitignore

@@ -1,6 +1,7 @@
 .idea
 .bundle
 gemfiles/*.lock
+gemfiles/bin
 log
 pkg
 spec/app/**/db/*.sqlite*

Appraisals

@@ -3,15 +3,15 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION <= '3.0'
   appraise 'rails-5.2' do
     gem 'activerecord-jdbcsqlite3-adapter', '~> 52.5', platform: :jruby
     gem 'bootsnap', '~> 1.4'
-    gem 'rails', '5.2.4.3'
+    gem 'rails', '5.2.8.1'
     gem 'rspec-rails', '~> 3.7'
     gem 'sqlite3', '< 1.4.0', platform: :ruby
   end
 
   appraise 'rails-6.0' do
     gem 'activerecord-jdbcsqlite3-adapter', '~> 60.1', platform: :jruby
     gem 'bootsnap', '~> 1.4'
-    gem 'rails', '6.0.3.1'
+    gem 'rails', '6.0.6.1'
     gem 'rspec-rails', '~> 3.7'
     gem 'sqlite3', '~> 1.4.0', platform: :ruby
   end
@@ -21,7 +21,7 @@ end
 appraise 'rails-6.1' do
   gem 'activerecord-jdbcsqlite3-adapter', '~> 61.1', platform: :jruby
   gem 'bootsnap', '>= 1.4.4'
-  gem 'rails', '6.1.4'
+  gem 'rails', '6.1.7.6'
   gem 'rspec-rails', '~> 5.0'
   gem 'sqlite3', '~> 1.4', platform: :ruby
   gem 'psych', '>= 4'

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 Install appraisal
 
 ```bash
-gem install bundler -v 1.17.3
+gem install bundler
 gem install appraisal
 ```
 
@@ -16,13 +16,19 @@ bundle install
 Bootstrap
 
 ```bash
-appraisal install
+bundle exec appraisal install
+```
+
+If you need to create new test app for specific rails version
+
+```bash
+bundle exec appraisal rails-7.0 rails new spec/app/rails_7.0
 ```
 
 Run the test suite:
 
 ```bash
-appraisal rspec
+bundle exec appraisal rspec
 ```
 
 If you modified any of the documentation files verify their format:

config.gemspec

@@ -32,7 +32,7 @@ Donate: \e[34mhttps://opencollective.com/rubyconfig/donate\e[0m\n"
   s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
 
   # Testing
-  s.add_development_dependency 'appraisal', '~> 2.3', '>= 2.3.0'
+  s.add_development_dependency 'appraisal', '~> 2.5', '>= 2.5.0'
   s.add_development_dependency 'rspec', '~> 3.9', '>= 3.9.0'
 
   # Default RSpec run will test against latest Rails app

gemfiles/rails_5.2.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", "~> 52.5", platform: :jruby
 gem "bootsnap", "~> 1.4"
-gem "rails", "5.2.4.3"
+gem "rails", "5.2.8.1"
 gem "rspec-rails", "~> 3.7"
 gem "sqlite3", "< 1.4.0", platform: :ruby
 

gemfiles/rails_6.0.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", "~> 60.1", platform: :jruby
 gem "bootsnap", "~> 1.4"
-gem "rails", "6.0.3.1"
+gem "rails", "6.0.6.1"
 gem "rspec-rails", "~> 3.7"
 gem "sqlite3", "~> 1.4.0", platform: :ruby
 

gemfiles/rails_6.1.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", "~> 61.1", platform: :jruby
 gem "bootsnap", ">= 1.4.4"
-gem "rails", "6.1.4"
+gem "rails", "6.1.7.6"
 gem "rspec-rails", "~> 5.0"
 gem "sqlite3", "~> 1.4", platform: :ruby
 gem "psych", ">= 4"