diff --git a/Gemfile b/Gemfile index d4932d87159..9a03d66ef88 100644 --- a/Gemfile +++ b/Gemfile @@ -35,6 +35,12 @@ gem "terser", ">= 1.1.4", require: false # Explicitly avoid 1.x that doesn't support Ruby 2.4+ gem "json", ">= 2.0.0" +# net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1, but is used by the `mail` gem. +# So we need to add them as dependencies until `mail` is fixed: https://github.com/mikel/mail/pull/1439 +gem "net-smtp", require: false +gem "net-imap", require: false +gem "net-pop", require: false + group :rubocop do gem "rubocop", ">= 0.90", require: false gem "rubocop-minitest", require: false @@ -176,11 +182,3 @@ end gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "wdm", ">= 0.1.0", platforms: [:mingw, :mswin, :x64_mingw, :mswin64] - -if RUBY_VERSION >= "3.1" - # net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1, but is used by the `mail` gem. - # So we need to add them as dependencies until `mail` is fixed: https://github.com/mikel/mail/pull/1439 - gem "net-smtp", require: false - gem "net-imap", require: false - gem "net-pop", require: false -end diff --git a/Gemfile.lock b/Gemfile.lock index e0fdf236995..01e13158a50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,21 +113,21 @@ GEM amq-protocol (2.3.2) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.541.0) - aws-sdk-core (3.124.0) + aws-partitions (1.544.0) + aws-sdk-core (3.125.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.52.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-kms (1.53.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.109.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-s3 (1.111.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-sns (1.49.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-sns (1.50.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) @@ -139,7 +139,7 @@ GEM faraday_middleware (~> 1.0, >= 1.0.0.rc1) net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) - backburner (1.5.0) + backburner (1.6.0) beaneater (~> 1.0) concurrent-ruby (~> 1.0, >= 1.0.1) dante (> 0.1.5) @@ -189,9 +189,9 @@ GEM railties (>= 6.0.0) curses (1.4.2) daemons (1.4.1) - dalli (3.1.3) + dalli (3.2.0) dante (0.2.0) - debug (1.3.4) + debug (1.4.0) irb (>= 1.3.6) reline (>= 0.2.7) declarative (0.0.20) @@ -200,6 +200,7 @@ GEM delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) + digest (3.1.0) digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) em-http-request (1.1.7) @@ -300,9 +301,10 @@ GEM importmap-rails (1.0.1) actionpack (>= 6.0.0) railties (>= 6.0.0) - io-console (0.5.9) - irb (1.3.7) - reline (>= 0.2.7) + io-console (0.5.11) + io-wait (0.2.1) + irb (1.4.1) + reline (>= 0.3.0) jmespath (1.4.0) jsbundling-rails (1.0.0) railties (>= 6.0.0) @@ -346,17 +348,28 @@ GEM ruby2_keywords (~> 0.0.1) net-http-persistent (4.0.1) connection_pool (~> 2.2) + net-imap (0.2.2) + 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) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogiri (1.12.5-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.12.5-x86_64-linux) - racc (~> 1.4) os (1.1.4) parallel (1.21.0) - parser (3.0.3.2) + parser (3.1.0.0) ast (~> 2.4.1) path_expander (1.1.0) pg (1.2.3) @@ -396,7 +409,7 @@ GEM redis-namespace (1.8.1) redis (>= 3.0.4) regexp_parser (2.2.0) - reline (0.2.7) + reline (0.3.1) io-console (~> 0.5) representable (3.1.1) declarative (< 0.1.0) @@ -416,25 +429,25 @@ GEM retriable (3.1.2) rexml (3.2.5) rouge (3.27.0) - rubocop (1.23.0) + rubocop (1.24.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.12.0, < 2.0) + rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.0) + rubocop-ast (1.15.1) parser (>= 3.0.1.1) rubocop-minitest (0.17.0) rubocop (>= 0.90, < 2.0) rubocop-packaging (0.5.1) rubocop (>= 0.89, < 2.0) - rubocop-performance (1.12.0) + rubocop-performance (1.13.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.12.4) + rubocop-rails (2.13.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -451,7 +464,7 @@ GEM childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) - sequel (5.51.0) + sequel (5.52.0) serverengine (2.0.7) sigdump (~> 0.2.2) set (1.0.2) @@ -489,11 +502,16 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.4.2) stackprof (0.2.17) - stimulus-rails (1.0.0) + stimulus-rails (1.0.2) railties (>= 6.0.0) + strscan (3.0.1) sucker_punch (3.0.1) concurrent-ruby (~> 1.0) - tailwindcss-rails (1.0.0) + tailwindcss-rails (2.0.3) + railties (>= 6.0.0) + tailwindcss-rails (2.0.3-x86_64-darwin) + railties (>= 6.0.0) + tailwindcss-rails (2.0.3-x86_64-linux) railties (>= 6.0.0) terser (1.1.8) execjs (>= 0.3.0, < 3) @@ -501,8 +519,9 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.1.0) + thor (1.2.1) tilt (2.0.10) + timeout (0.2.0) trailblazer-option (0.1.2) turbo-rails (1.0.0) actionpack (>= 6.0.0) @@ -533,10 +552,11 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.1) + zeitwerk (2.5.3) PLATFORMS ruby + x86_64-darwin x86_64-darwin-19 x86_64-darwin-20 x86_64-linux @@ -574,6 +594,9 @@ DEPENDENCIES minitest-ci minitest-retry mysql2 (~> 0.5)! + net-imap + net-pop + net-smtp nokogiri (>= 1.8.1, != 1.11.0) pg (~> 1.1) propshaft (>= 0.1.7) @@ -620,4 +643,4 @@ DEPENDENCIES websocket-client-simple! BUNDLED WITH - 2.2.32 + 2.3.4