Use a more recent version of the mail gem to have the corect dependen…

…cies * See mikel/mail#1472 (comment)
thermofisher-jch · Aug 16, 2023 · 46727a3 · 46727a3
1 parent a0ac523
commit 46727a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/test/truffle/ecosystem/blog6/Gemfile.lock.renamed b/test/truffle/ecosystem/blog6/Gemfile.lock.renamed
@@ -75,14 +75,25 @@ GEM
     loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0.rc1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     mysql2 (0.5.3)
+    net-imap (0.3.1)
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.2)
+      net-protocol
     nio4r (2.5.8)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
@@ -140,6 +151,7 @@ GEM
     sqlite3 (1.4.2)
     thor (1.1.0)
     tilt (2.0.10)
+    timeout (0.3.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -156,6 +168,7 @@ PLATFORMS
 DEPENDENCIES
   asciidoctor
   jbuilder (~> 2.5)
+  mail (>= 2.8.0.rc1)
   mysql2 (>= 0.4.4, < 0.6.0)
   pg (>= 0.18, < 2.0)
   puma (~> 3.11)

diff --git a/test/truffle/ecosystem/blog6/Gemfile.renamed b/test/truffle/ecosystem/blog6/Gemfile.renamed
@@ -45,4 +45,8 @@ gem 'jbuilder', '~> 2.5'
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
+# App-specific
 gem 'asciidoctor'
+
+# Use a more recent mail gem to have the correct dependencies
+gem 'mail', '>= 2.8.0.rc1'
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -36,7 +36,7 @@
 CACHE_EXTRA_DIR = File.expand_path('~/.mx/cache/truffleruby')
 FileUtils.mkdir_p(CACHE_EXTRA_DIR)
 
-TRUFFLERUBY_GEM_TEST_PACK_VERSION = '1da2256bb66e7a055ae5531ee2d61a8836a496ee'
+TRUFFLERUBY_GEM_TEST_PACK_VERSION = '9bba45bf28720fe125468380c16b3cef6aaa4670'
 
 JDEBUG = '--vm.agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y'
 METRICS_REPS = Integer(ENV['TRUFFLERUBY_METRICS_REPS'] || 10)