From a852b17165ba8a864ee5bda061fb3ade63cd4501 Mon Sep 17 00:00:00 2001 From: Nathaniel Bibler Date: Sun, 23 Jan 2022 14:37:29 -0500 Subject: [PATCH] feat: allow for a rails 7.0 dependency --- .github/workflows/tests.yml | 1 + Appraisals | 4 + CHANGELOG.md | 2 +- Gemfile.lock | 219 ++++++++++++++++++---------------- gemfiles/rails5.2.gemfile | 2 + gemfiles/rails6.0.gemfile | 2 + gemfiles/rails6.1.gemfile | 2 + gemfiles/rails7.0.gemfile | 11 ++ gemfiles/rails_latest.gemfile | 2 + gemfiles/sinatra2.x.gemfile | 2 + rapporteur.gemspec | 2 +- 11 files changed, 147 insertions(+), 102 deletions(-) create mode 100644 gemfiles/rails7.0.gemfile diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8878ce4..52bab4c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,6 +38,7 @@ jobs: - "gemfiles/rails5.2.gemfile" - "gemfiles/rails6.0.gemfile" - "gemfiles/rails6.1.gemfile" + - "gemfiles/rails7.0.gemfile" - "gemfiles/rails_latest.gemfile" - "gemfiles/sinatra2.x.gemfile" name: "Test and Release" diff --git a/Appraisals b/Appraisals index 2868520..273d032 100644 --- a/Appraisals +++ b/Appraisals @@ -13,6 +13,10 @@ appraise 'rails6.1' do gem 'rails', '~> 6.1.0' end +appraise 'rails7.0' do + gem 'rails', '~> 7.0.0' +end + appraise 'rails-latest' do gem 'rails' end diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bed336..9331bbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ ## [HEAD][] / unreleased -* No significant changes. +* Add support for Rails 7.0. ## [3.7.2][] / 2021-06-22 diff --git a/Gemfile.lock b/Gemfile.lock index 3d5b58f..daaa835 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,149 +7,173 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.1.4.1) - actionpack (= 6.1.4.1) - activesupport (= 6.1.4.1) + actioncable (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.1) - actionpack (= 6.1.4.1) - activejob (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) + actionmailbox (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) mail (>= 2.7.1) - actionmailer (6.1.4.1) - actionpack (= 6.1.4.1) - actionview (= 6.1.4.1) - activejob (= 6.1.4.1) - activesupport (= 6.1.4.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.1) + actionpack (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activesupport (= 7.0.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.4.1) - actionview (= 6.1.4.1) - activesupport (= 6.1.4.1) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.1) + actionview (= 7.0.1) + activesupport (= 7.0.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.1) - actionpack (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) + actiontext (7.0.1) + actionpack (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.4.1) - activesupport (= 6.1.4.1) + actionview (7.0.1) + activesupport (= 7.0.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.1) - activesupport (= 6.1.4.1) + activejob (7.0.1) + activesupport (= 7.0.1) globalid (>= 0.3.6) - activemodel (6.1.4.1) - activesupport (= 6.1.4.1) - activerecord (6.1.4.1) - activemodel (= 6.1.4.1) - activesupport (= 6.1.4.1) - activerecord-jdbc-adapter (61.1-java) - activerecord (~> 6.1.0) - activerecord-jdbcsqlite3-adapter (61.1-java) - activerecord-jdbc-adapter (= 61.1) + activemodel (7.0.1) + activesupport (= 7.0.1) + activerecord (7.0.1) + activemodel (= 7.0.1) + activesupport (= 7.0.1) + activerecord-jdbc-adapter (50.0) + activerecord (>= 2.2) + activerecord-jdbcsqlite3-adapter (50.0) + activerecord-jdbc-adapter (~> 50.0) jdbc-sqlite3 (~> 3.8, < 3.30) - activestorage (6.1.4.1) - actionpack (= 6.1.4.1) - activejob (= 6.1.4.1) - activerecord (= 6.1.4.1) - activesupport (= 6.1.4.1) - marcel (~> 1.0.0) + activestorage (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activesupport (= 7.0.1) + marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.1) + activesupport (7.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) appraisal (2.4.1) bundler rake thor (>= 0.14.0) ast (2.4.2) builder (3.2.4) - combustion (1.3.1) + combustion (1.3.5) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) concurrent-ruby (1.1.9) crass (1.0.6) - diff-lcs (1.4.4) + diff-lcs (1.5.0) + digest (3.1.0) + digest (3.1.0-java) erubi (1.10.0) - globalid (0.5.2) + globalid (1.0.0) activesupport (>= 5.0) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) + io-wait (0.2.1) jdbc-sqlite3 (3.28.0) - loofah (2.12.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) - mini_mime (1.1.1) - mini_portile2 (2.6.1) - minitest (5.14.4) + mini_mime (1.1.2) + mini_portile2 (2.7.1) + minitest (5.15.0) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.2) + io-wait + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.8) nio4r (2.5.8-java) - nokogiri (1.12.4) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) - nokogiri (1.12.4-java) + nokogiri (1.13.1-java) racc (~> 1.4) parallel (1.21.0) - parser (3.0.2.0) + parser (3.1.0.0) ast (~> 2.4.1) - racc (1.5.2) - racc (1.5.2-java) + racc (1.6.0) + racc (1.6.0-java) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.4.1) - actioncable (= 6.1.4.1) - actionmailbox (= 6.1.4.1) - actionmailer (= 6.1.4.1) - actionpack (= 6.1.4.1) - actiontext (= 6.1.4.1) - actionview (= 6.1.4.1) - activejob (= 6.1.4.1) - activemodel (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) + rails (7.0.1) + actioncable (= 7.0.1) + actionmailbox (= 7.0.1) + actionmailer (= 7.0.1) + actionpack (= 7.0.1) + actiontext (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activemodel (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) bundler (>= 1.15.0) - railties (= 6.1.4.1) - sprockets-rails (>= 2.0.0) + railties (= 7.0.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.4.1) - actionpack (= 6.1.4.1) - activesupport (= 6.1.4.1) + railties (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) - rainbow (3.0.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.1.1) + regexp_parser (2.2.0) rexml (3.2.5) rspec-collection_matchers (1.2.0) rspec-expectations (>= 2.99.0.beta1) rspec-core (3.10.1) rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-mocks (3.10.2) @@ -163,30 +187,30 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - rubocop (1.21.0) + rspec-support (3.10.3) + rubocop (1.25.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.11.0) + rubocop-ast (1.15.1) parser (>= 3.0.1.1) - rubocop-minitest (0.15.0) + rubocop-minitest (0.17.0) rubocop (>= 0.90, < 2.0) rubocop-packaging (0.5.1) rubocop (>= 0.89, < 2.0) - rubocop-performance (1.11.5) + rubocop-performance (1.13.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.12.2) + rubocop-rails (2.13.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - rubocop-rails_config (1.7.3) + rubocop-rails_config (1.8.0) railties (>= 5.0) rubocop (>= 1.19) rubocop-ast (>= 1.0.1) @@ -195,15 +219,10 @@ GEM rubocop-performance (~> 1.11) rubocop-rails (~> 2.0) ruby-progressbar (1.11.0) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) sqlite3 (1.4.2) - thor (1.1.0) + strscan (3.0.1) + thor (1.2.1) + timeout (0.2.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (2.1.0) @@ -212,7 +231,7 @@ GEM websocket-driver (0.7.5-java) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.4.2) + zeitwerk (2.5.3) PLATFORMS java @@ -222,7 +241,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter appraisal (~> 2.1) combustion (~> 1.0) - rails (>= 3.1, < 7) + rails (>= 3.1, < 7.1) rake (~> 13.0) rapporteur! rspec-collection_matchers (~> 1.0) @@ -235,4 +254,4 @@ RUBY VERSION ruby 2.7.4p191 BUNDLED WITH - 2.2.27 + 2.3.5 diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile index 8db6c06..2d95618 100644 --- a/gemfiles/rails5.2.gemfile +++ b/gemfiles/rails5.2.gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" +ruby "2.7.4" + gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby gem "sqlite3", "< 1.4", platforms: :ruby gem "rails", "~> 5.2.0" diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile index a33faff..0babce9 100644 --- a/gemfiles/rails6.0.gemfile +++ b/gemfiles/rails6.0.gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" +ruby "2.7.4" + gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby gem "sqlite3", platforms: :ruby gem "rails", "~> 6.0.0" diff --git a/gemfiles/rails6.1.gemfile b/gemfiles/rails6.1.gemfile index 62b20e3..a49fd14 100644 --- a/gemfiles/rails6.1.gemfile +++ b/gemfiles/rails6.1.gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" +ruby "2.7.4" + gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby gem "sqlite3", platforms: :ruby gem "rails", "~> 6.1.0" diff --git a/gemfiles/rails7.0.gemfile b/gemfiles/rails7.0.gemfile new file mode 100644 index 0000000..96a1b6f --- /dev/null +++ b/gemfiles/rails7.0.gemfile @@ -0,0 +1,11 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +ruby "2.7.4" + +gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby +gem "sqlite3", platforms: :ruby +gem "rails", "~> 7.0.0" + +gemspec path: "../" diff --git a/gemfiles/rails_latest.gemfile b/gemfiles/rails_latest.gemfile index f84fdb9..b1dd4b5 100644 --- a/gemfiles/rails_latest.gemfile +++ b/gemfiles/rails_latest.gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" +ruby "2.7.4" + gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby gem "sqlite3", platforms: :ruby gem "rails" diff --git a/gemfiles/sinatra2.x.gemfile b/gemfiles/sinatra2.x.gemfile index beb269d..b6db4ef 100644 --- a/gemfiles/sinatra2.x.gemfile +++ b/gemfiles/sinatra2.x.gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" +ruby "2.7.4" + gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby gem "sqlite3", platforms: :ruby gem "sinatra", "~> 2.0" diff --git a/rapporteur.gemspec b/rapporteur.gemspec index 99c3b20..8326982 100644 --- a/rapporteur.gemspec +++ b/rapporteur.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'appraisal', '~> 2.1' spec.add_development_dependency 'combustion', '~> 1.0' - spec.add_development_dependency 'rails', '>= 3.1', '< 7' + spec.add_development_dependency 'rails', '>= 3.1', '< 7.1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-collection_matchers', '~> 1.0' spec.add_development_dependency 'rspec-rails', '~> 5.0'