From 44ba0cafef98171468ae1faadcc878d1a3fff5ee Mon Sep 17 00:00:00 2001 From: Marten Veldthuis Date: Tue, 7 Mar 2023 16:15:03 +0100 Subject: [PATCH] Add Rails 7 compatibility --- Gemfile.lock | 142 ++++++++++++++++++++++------------------ sparkpost_rails.gemspec | 3 +- 2 files changed, 82 insertions(+), 63 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 701fd56..1167a2c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,114 +2,132 @@ PATH remote: . specs: sparkpost_rails (1.5.5) - actionmailer (>= 4.0, < 6.2) - railties (>= 4.0, < 6.2) + actionmailer (>= 4.0, < 8.0) + railties (>= 4.0, < 8.0) GEM remote: http://rubygems.org/ specs: - actionmailer (6.1.3) - actionpack (= 6.1.3) - actionview (= 6.1.3) - activejob (= 6.1.3) - activesupport (= 6.1.3) + actionmailer (7.0.4.2) + actionpack (= 7.0.4.2) + actionview (= 7.0.4.2) + activejob (= 7.0.4.2) + activesupport (= 7.0.4.2) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.3) - actionview (= 6.1.3) - activesupport (= 6.1.3) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.4.2) + actionview (= 7.0.4.2) + activesupport (= 7.0.4.2) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.3) - activesupport (= 6.1.3) + actionview (7.0.4.2) + activesupport (= 7.0.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.3) - activesupport (= 6.1.3) + activejob (7.0.4.2) + activesupport (= 7.0.4.2) globalid (>= 0.3.6) - activesupport (6.1.3) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) builder (3.2.4) - concurrent-ruby (1.1.8) + concurrent-ruby (1.2.2) crack (0.4.5) rexml crass (1.0.6) - diff-lcs (1.4.4) - erubi (1.10.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + date (3.3.3) + diff-lcs (1.5.0) + erubi (1.12.0) + globalid (1.1.0) + activesupport (>= 5.0) hashdiff (1.0.1) - i18n (1.8.9) + i18n (1.12.0) concurrent-ruby (~> 1.0) - loofah (2.9.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp method_source (1.0.0) - mini_mime (1.0.3) - mini_portile2 (2.5.0) - minitest (5.14.4) - nokogiri (1.11.2) - mini_portile2 (~> 2.5.0) + mini_mime (1.1.2) + mini_portile2 (2.8.1) + minitest (5.18.0) + net-imap (0.3.4) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nokogiri (1.14.2) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.11.2-x86_64-darwin) + nokogiri (1.14.2-x86_64-darwin) racc (~> 1.4) - public_suffix (4.0.6) - racc (1.5.2) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) + public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.6.3) + rack-test (2.0.2) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) - railties (6.1.3) - actionpack (= 6.1.3) - activesupport (= 6.1.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) method_source - rake (>= 0.8.7) + rake (>= 12.2) thor (~> 1.0) - rake (13.0.3) - rexml (3.2.4) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + zeitwerk (~> 2.5) + rake (13.0.6) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) - thor (1.1.0) - tzinfo (2.0.4) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + thor (1.2.1) + timeout (0.3.2) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - webmock (3.12.0) - addressable (>= 2.3.6) + webmock (3.18.1) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - zeitwerk (2.4.2) + zeitwerk (2.6.7) PLATFORMS ruby x86_64-darwin-19 DEPENDENCIES + net-smtp rspec (>= 3.4.0) sparkpost_rails! webmock (>= 1.24.2) diff --git a/sparkpost_rails.gemspec b/sparkpost_rails.gemspec index cbb0056..d3d7263 100644 --- a/sparkpost_rails.gemspec +++ b/sparkpost_rails.gemspec @@ -16,9 +16,10 @@ Gem::Specification.new do |s| s.test_files = Dir["{spec}/**/*"] %w[actionmailer railties].each do |rails_gem| - s.add_dependency rails_gem, '>= 4.0', '< 6.2' + s.add_dependency rails_gem, '>= 4.0', '< 8.0' end s.add_development_dependency "rspec", '>= 3.4.0' s.add_development_dependency "webmock", '>= 1.24.2' + s.add_development_dependency "net-smtp" end