diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9da04c..7554bf8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,6 +8,7 @@ jobs: gemfile: - Gemfile - gemfiles/Gemfile-rails-main + - gemfiles/Gemfile-rails-7-0 - gemfiles/Gemfile-rails-6-1 - gemfiles/Gemfile-rails-6-0 - gemfiles/Gemfile-rails-5-2 @@ -27,6 +28,10 @@ jobs: ruby: '2.6' - gemfile: gemfiles/Gemfile-rails-main ruby: '2.5' + - gemfile: gemfiles/Gemfile-rails-7-0 + ruby: '2.6' + - gemfile: gemfiles/Gemfile-rails-7-0 + ruby: '2.5' - gemfile: gemfiles/Gemfile-rails-6-0 ruby: '3.2' - gemfile: gemfiles/Gemfile-rails-6-0 diff --git a/CHANGELOG.md b/CHANGELOG.md index f80ff11..fe58708 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Unreleased +* Add support for Rails 7.1. (no changes required.) # 1.10.0 diff --git a/Gemfile b/Gemfile index 6c1c2d3..778564c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,7 @@ source 'https://rubygems.org' gemspec gem 'rake' -# https://github.com/rdoc/rdoc/blob/e02728fdf440012ace74b62b00b4f4954d2f91c3/History.rdoc#430--2016-11-04 -gem 'rdoc', ">= 4.3" +gem 'rdoc' -gem 'actionmailer', '~> 7.0.0' -gem 'activemodel', '~> 7.0.0' +gem 'actionmailer', '~> 7.1.0' +gem 'activemodel', '~> 7.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index aca0c68..bb54ce3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,99 +8,117 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (7.1.0) + actionpack (= 7.1.0) + actionview (= 7.1.0) + activejob (= 7.1.0) + activesupport (= 7.1.0) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) - rack (~> 2.0, >= 2.2.0) + rails-dom-testing (~> 2.2) + actionpack (7.1.0) + actionview (= 7.1.0) + activesupport (= 7.1.0) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.4) - activesupport (= 7.0.4) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.0) + activesupport (= 7.1.0) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4) - activesupport (= 7.0.4) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.0) + activesupport (= 7.1.0) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activesupport (7.0.4) + activemodel (7.1.0) + activesupport (= 7.1.0) + activesupport (7.1.0) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) + base64 (0.1.1) + bigdecimal (3.1.4) builder (3.2.4) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) crass (1.0.6) date (3.3.3) + drb (2.1.1) + ruby2_keywords erubi (1.12.0) - globalid (1.0.0) - activesupport (>= 5.0) - i18n (1.12.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.1) concurrent-ruby (~> 1.0) - loofah (2.19.1) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.8.0.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.17.0) - net-imap (0.3.4) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) + mutex_m (0.1.2) + net-imap (0.4.1) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol - nokogiri (1.14.0) - mini_portile2 (~> 2.8.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) psych (5.0.1) stringio - racc (1.6.2) - rack (2.2.5) - rack-test (2.0.2) + racc (1.7.1) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rake (13.0.6) rdoc (6.5.0) psych (>= 4.0.0) + ruby2_keywords (0.0.5) stringio (3.0.4) - timeout (0.3.1) - tzinfo (2.0.5) + timeout (0.4.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) PLATFORMS ruby DEPENDENCIES - actionmailer (~> 7.0.0) - activemodel (~> 7.0.0) + actionmailer (~> 7.1.0) + activemodel (~> 7.1.0) mail_form! rake - rdoc (>= 4.3) + rdoc BUNDLED WITH - 2.4.3 + 2.4.20 diff --git a/gemfiles/Gemfile-rails-5-2 b/gemfiles/Gemfile-rails-5-2 index 4b93ac6..e871aad 100644 --- a/gemfiles/Gemfile-rails-5-2 +++ b/gemfiles/Gemfile-rails-5-2 @@ -3,8 +3,7 @@ source 'https://rubygems.org' gemspec path: '..' gem 'rake' -# https://github.com/rdoc/rdoc/blob/e02728fdf440012ace74b62b00b4f4954d2f91c3/History.rdoc#430--2016-11-04 -gem 'rdoc', ">= 4.3" +gem 'rdoc' gem 'actionmailer', '~> 5.2.0' gem 'activemodel', '~> 5.2.0' diff --git a/gemfiles/Gemfile-rails-7-0 b/gemfiles/Gemfile-rails-7-0 new file mode 100644 index 0000000..2dd1318 --- /dev/null +++ b/gemfiles/Gemfile-rails-7-0 @@ -0,0 +1,9 @@ +source 'https://rubygems.org' + +gemspec path: ".." + +gem 'rake' +gem 'rdoc' + +gem 'actionmailer', '~> 7.0.0' +gem 'activemodel', '~> 7.0.0'