Merge pull request rails#50668 from Earlopain/clean-mail-dependencies

Remove workaround for `mail` gem dependencies

Author: byroot

Gemfile.lock

@@ -32,19 +32,13 @@ PATH
       activerecord (= 7.2.0.alpha)
       activestorage (= 7.2.0.alpha)
       activesupport (= 7.2.0.alpha)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
+      mail (>= 2.8.0)
     actionmailer (7.2.0.alpha)
       actionpack (= 7.2.0.alpha)
       actionview (= 7.2.0.alpha)
       activejob (= 7.2.0.alpha)
       activesupport (= 7.2.0.alpha)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+      mail (~> 2.5, >= 2.8.0)
       rails-dom-testing (~> 2.2)
     actionpack (7.2.0.alpha)
       actionview (= 7.2.0.alpha)

actionmailbox/actionmailbox.gemspec

@@ -38,8 +38,5 @@ Gem::Specification.new do |s|
   s.add_dependency "activejob",     version
   s.add_dependency "actionpack",    version
 
-  s.add_dependency "mail", ">= 2.7.1"
-  s.add_dependency "net-imap"
-  s.add_dependency "net-pop"
-  s.add_dependency "net-smtp"
+  s.add_dependency "mail", ">= 2.8.0"
 end

actionmailer/actionmailer.gemspec

@@ -38,9 +38,6 @@ Gem::Specification.new do |s|
   s.add_dependency "actionview", version
   s.add_dependency "activejob", version
 
-  s.add_dependency "mail", ["~> 2.5", ">= 2.5.4"]
-  s.add_dependency "net-imap"
-  s.add_dependency "net-pop"
-  s.add_dependency "net-smtp"
+  s.add_dependency "mail", ["~> 2.5", ">= 2.8.0"]
   s.add_dependency "rails-dom-testing", "~> 2.2"
 end

actionmailer/lib/action_mailer/delivery_methods.rb

@@ -32,8 +32,7 @@ module DeliveryMethods
 
       add_delivery_method :sendmail, Mail::Sendmail,
         location:  "/usr/sbin/sendmail",
-        # See breaking change in the mail gem - https://github.com/mikel/mail/commit/7e1196bd29815a0901d7290c82a332c0959b163a
-        arguments: Gem::Version.new(Mail::VERSION.version) >= Gem::Version.new("2.8.0") ? %w[-i] : "-i"
+        arguments: %w[-i]
 
       add_delivery_method :test, Mail::TestMailer
     end