Skip to content

Commit 3652f16

Browse files
committed
Use a more recent version of the mail gem to have the corect dependencies
* See mikel/mail#1472 (comment)
1 parent 546d918 commit 3652f16

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

test/truffle/ecosystem/blog6/Gemfile.lock.renamed

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,25 @@ GEM
7575
loofah (2.12.0)
7676
crass (~> 1.0.2)
7777
nokogiri (>= 1.5.9)
78-
mail (2.7.1)
78+
mail (2.8.0.rc1)
7979
mini_mime (>= 0.1.1)
80+
net-imap
81+
net-pop
82+
net-smtp
8083
marcel (1.0.2)
8184
method_source (1.0.0)
8285
mini_mime (1.1.2)
8386
mini_portile2 (2.6.1)
8487
minitest (5.14.4)
8588
mysql2 (0.5.3)
89+
net-imap (0.3.1)
90+
net-protocol
91+
net-pop (0.1.2)
92+
net-protocol
93+
net-protocol (0.1.3)
94+
timeout
95+
net-smtp (0.3.2)
96+
net-protocol
8697
nio4r (2.5.8)
8798
nokogiri (1.12.5)
8899
mini_portile2 (~> 2.6.1)
@@ -140,6 +151,7 @@ GEM
140151
sqlite3 (1.4.2)
141152
thor (1.1.0)
142153
tilt (2.0.10)
154+
timeout (0.3.0)
143155
turbolinks (5.2.1)
144156
turbolinks-source (~> 5.2)
145157
turbolinks-source (5.2.0)
@@ -156,6 +168,7 @@ PLATFORMS
156168
DEPENDENCIES
157169
asciidoctor
158170
jbuilder (~> 2.5)
171+
mail (>= 2.8.0.rc1)
159172
mysql2 (>= 0.4.4, < 0.6.0)
160173
pg (>= 0.18, < 2.0)
161174
puma (~> 3.11)

test/truffle/ecosystem/blog6/Gemfile.renamed

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,8 @@ gem 'jbuilder', '~> 2.5'
4545
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
4646
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
4747

48+
# App-specific
4849
gem 'asciidoctor'
50+
51+
# Use a more recent mail gem to have the correct dependencies
52+
gem 'mail', '>= 2.8.0.rc1'

tool/jt.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
CACHE_EXTRA_DIR = File.expand_path('~/.mx/cache/truffleruby')
3737
FileUtils.mkdir_p(CACHE_EXTRA_DIR)
3838

39-
TRUFFLERUBY_GEM_TEST_PACK_VERSION = '1da2256bb66e7a055ae5531ee2d61a8836a496ee'
39+
TRUFFLERUBY_GEM_TEST_PACK_VERSION = '9bba45bf28720fe125468380c16b3cef6aaa4670'
4040

4141
JDEBUG = '--vm.agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y'
4242
METRICS_REPS = Integer(ENV['TRUFFLERUBY_METRICS_REPS'] || 10)

0 commit comments

Comments
 (0)