Skip to content

Commit

Permalink
feat: allow for a rails 7.0 dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@nbibler
nbibler committed Jan 23, 2022
1 parent 68f783f commit a852b17
Show file tree
Hide file tree
Showing 11 changed files with 147 additions and 102 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## [HEAD][] / unreleased

* No significant changes.
* Add support for Rails 7.0.

## [3.7.2][] / 2021-06-22

Expand Down
219 changes: 119 additions & 100 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -235,4 +254,4 @@ RUBY VERSION
ruby 2.7.4p191

BUNDLED WITH
2.2.27
2.3.5
2 changes: 2 additions & 0 deletions gemfiles/rails5.2.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/rails6.0.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/rails6.1.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit a852b17

Please sign in to comment.