Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit be97ce5

Browse files
cwillemsMrSerth
authored andcommitted
Upgrade Ruby to 3.1.4
* drop therubyracer * replace paperclip (deprecated) by community-maintained kt-paperclip * upgrade incompatible gems * add gems that now need to be added explicitly
1 parent 3732422 commit be97ce5

File tree

3 files changed

+51
-39
lines changed

3 files changed

+51
-39
lines changed

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.4
1+
3.1.4

Diff for: Gemfile

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '2.7.4'
2+
ruby '3.1.4'
33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
55
gem 'rails', '~> 6.1.6.1'
@@ -16,9 +16,6 @@ gem 'uglifier'
1616
# Use CoffeeScript for .js.coffee assets and views
1717
gem 'coffee-rails', '~> 5.0'
1818

19-
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
20-
gem 'therubyracer', '~> 0.12.0', platforms: :ruby
21-
2219
# Use jquery as the JavaScript library
2320
gem 'jquery-rails', '~> 4.3'
2421

@@ -80,7 +77,7 @@ gem 'rest-client'
8077
gem 'highline'
8178

8279
# for picture Upload
83-
gem 'paperclip', '~> 6.1.0'
80+
gem 'kt-paperclip'
8481

8582
# for cron jobs
8683
gem 'whenever'
@@ -95,7 +92,7 @@ gem 'jquery-raty-rails', git: 'https://github.com/bmc/jquery-raty-rails.git'
9592
gem 'jquery-turbolinks'
9693

9794
# a Helper to validate dates
98-
gem 'validates_timeliness', '~> 5.0'
95+
gem 'validates_timeliness'
9996

10097
# replacement for glyphicons
10198
gem 'font-awesome-rails'
@@ -116,7 +113,7 @@ gem 'traco'
116113
# WYSIWYG Text Editor
117114
gem 'tinymce-rails', '~> 5.6'
118115
gem 'tinymce-rails-langs', '~> 5.20200505'
119-
gem 'sanitize', '~> 5.2'
116+
gem 'sanitize'
120117

121118
# Birthdate validation
122119
gem 'chronic', '~> 0.10.2'
@@ -147,3 +144,10 @@ gem 'capistrano', '~> 3.13'
147144
gem 'capistrano-rails', '~> 1.6'
148145
gem 'capistrano-bundler'
149146
gem 'capistrano-rvm'
147+
148+
# Gems needed explicitly after Ruby 3.1.4 upgrade
149+
gem "matrix", "~> 0.4.2"
150+
gem "net-ftp", "~> 0.2.0"
151+
gem "net-smtp", "~> 0.4.0"
152+
gem "webrick", "~> 1.8"
153+
gem "phantomjs", "~> 2.1", :require => 'phantomjs/poltergeist'

Diff for: Gemfile.lock

+39-31
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ GEM
137137
activerecord (>= 5.a)
138138
database_cleaner-core (~> 2.0.0)
139139
database_cleaner-core (2.0.1)
140+
date (3.3.3)
140141
diff-lcs (1.4.4)
141-
docile (1.3.5)
142+
docile (1.4.0)
142143
domain_name (0.5.20190701)
143144
unf (>= 0.0.5, < 1.0.0)
144145
email_spec (2.2.0)
@@ -188,50 +189,53 @@ GEM
188189
jquery-ui-rails (6.0.1)
189190
railties (>= 3.2.16)
190191
kgio (2.11.3)
192+
kt-paperclip (7.2.1)
193+
activemodel (>= 4.2.0)
194+
activesupport (>= 4.2.0)
195+
marcel (~> 1.0.1)
196+
mime-types
197+
terrapin (~> 0.6.0)
191198
launchy (2.5.0)
192199
addressable (~> 2.7)
193200
letter_opener (1.7.0)
194201
launchy (~> 2.2)
195-
libv8 (3.16.14.19)
196202
loofah (2.18.0)
197203
crass (~> 1.0.2)
198204
nokogiri (>= 1.5.9)
199205
mail (2.7.1)
200206
mini_mime (>= 0.1.1)
201207
marcel (1.0.2)
208+
matrix (0.4.2)
202209
method_source (1.0.0)
203210
mime-types (3.3.1)
204211
mime-types-data (~> 3.2015)
205212
mime-types-data (3.2021.0225)
206-
mimemagic (0.3.10)
207-
nokogiri (~> 1)
208-
rake
209213
mini_mime (1.1.2)
210214
mini_portile2 (2.8.0)
211215
minitest (5.15.0)
212216
multipart-post (2.1.1)
217+
net-ftp (0.2.0)
218+
net-protocol
219+
time
220+
net-protocol (0.2.1)
221+
timeout
213222
net-scp (3.0.0)
214223
net-ssh (>= 2.6.5, < 7.0.0)
224+
net-smtp (0.4.0)
225+
net-protocol
215226
net-ssh (6.1.0)
216227
netrc (0.11.0)
217228
nio4r (2.5.8)
218229
nokogiri (1.13.6)
219230
mini_portile2 (~> 2.8.0)
220231
racc (~> 1.4)
221-
nokogumbo (2.0.4)
222-
nokogiri (~> 1.8, >= 1.8.4)
223232
open_id_authentication (1.3.0)
224233
rack-openid (~> 1.3)
225-
paperclip (6.1.0)
226-
activemodel (>= 4.2.0)
227-
activesupport (>= 4.2.0)
228-
mime-types
229-
mimemagic (~> 0.3.0)
230-
terrapin (~> 0.6.0)
231234
parallel (1.20.1)
232235
parser (3.0.0.0)
233236
ast (~> 2.4.1)
234237
pg (1.2.3)
238+
phantomjs (2.1.1.0)
235239
poltergeist (1.18.1)
236240
capybara (>= 2.1, < 4)
237241
cliver (~> 0.3.1)
@@ -282,7 +286,6 @@ GEM
282286
rake (13.0.6)
283287
rdoc (6.4.0)
284288
psych (>= 4.0.0)
285-
ref (2.0.0)
286289
regexp_parser (2.1.1)
287290
rest-client (2.1.0)
288291
http-accept (>= 1.7.0, < 2.0)
@@ -307,7 +310,7 @@ GEM
307310
rspec-mocks (~> 3.10)
308311
rspec-support (~> 3.10)
309312
rspec-support (3.10.2)
310-
rubocop (1.11.0)
313+
rubocop (1.13.0)
311314
parallel (~> 1.10)
312315
parser (>= 3.0.0.0)
313316
rainbow (>= 2.2.2, < 4.0)
@@ -324,10 +327,9 @@ GEM
324327
rubyzip (2.3.0)
325328
safe_target_blank (1.0.2)
326329
rails
327-
sanitize (5.2.3)
330+
sanitize (6.1.0)
328331
crass (~> 1.0.2)
329-
nokogiri (>= 1.8.0)
330-
nokogumbo (~> 2.0)
332+
nokogiri (>= 1.12.0)
331333
sassc (2.4.0)
332334
ffi (~> 1.9)
333335
sassc-rails (2.1.2)
@@ -346,12 +348,12 @@ GEM
346348
simple_form (5.1.0)
347349
actionpack (>= 5.2)
348350
activemodel (>= 5.2)
349-
simplecov (0.21.2)
351+
simplecov (0.22.0)
350352
docile (~> 1.1)
351353
simplecov-html (~> 0.11)
352354
simplecov_json_formatter (~> 0.1)
353355
simplecov-html (0.12.3)
354-
simplecov_json_formatter (0.1.2)
356+
simplecov_json_formatter (0.1.4)
355357
sprockets (4.0.3)
356358
concurrent-ruby (~> 1.0)
357359
rack (> 1, < 3)
@@ -365,12 +367,12 @@ GEM
365367
stringio (3.0.2)
366368
terrapin (0.6.0)
367369
climate_control (>= 0.0.3, < 1.0)
368-
therubyracer (0.12.3)
369-
libv8 (~> 3.16.14.15)
370-
ref
371370
thor (1.2.1)
372371
tilt (2.0.10)
372+
time (0.2.2)
373+
date
373374
timeliness (0.4.4)
375+
timeout (0.4.0)
374376
tinymce-rails (5.6.2.1)
375377
railties (>= 3.1.1)
376378
tinymce-rails-langs (5.20200505)
@@ -391,13 +393,15 @@ GEM
391393
unicorn (5.8.0)
392394
kgio (~> 2.6)
393395
raindrops (~> 0.7)
394-
validates_timeliness (5.0.0)
396+
validates_timeliness (6.0.1)
397+
activemodel (>= 6.0.0, < 7)
395398
timeliness (>= 0.3.10, < 1)
396399
web-console (4.2.0)
397400
actionview (>= 6.0.0)
398401
activemodel (>= 6.0.0)
399402
bindex (>= 0.4.0)
400403
railties (>= 6.0.0)
404+
webrick (1.8.1)
401405
websocket-driver (0.7.5)
402406
websocket-extensions (>= 0.1.0)
403407
websocket-extensions (0.1.5)
@@ -408,7 +412,7 @@ GEM
408412
will_paginate (>= 3.0.3)
409413
xpath (3.2.0)
410414
nokogiri (~> 1.8)
411-
zeitwerk (2.5.4)
415+
zeitwerk (2.6.12)
412416

413417
PLATFORMS
414418
ruby
@@ -441,10 +445,14 @@ DEPENDENCIES
441445
jquery-star-rating-rails
442446
jquery-turbolinks
443447
jquery-ui-rails
448+
kt-paperclip
444449
letter_opener
450+
matrix (~> 0.4.2)
451+
net-ftp (~> 0.2.0)
452+
net-smtp (~> 0.4.0)
445453
open_id_authentication
446-
paperclip (~> 6.1.0)
447454
pg (~> 1.2.3)
455+
phantomjs (~> 2.1)
448456
poltergeist
449457
rails (~> 6.1.6.1)
450458
rails-controller-testing
@@ -457,27 +465,27 @@ DEPENDENCIES
457465
rubocop
458466
ruby-openid
459467
safe_target_blank
460-
sanitize (~> 5.2)
468+
sanitize
461469
sassc-rails
462470
sdoc (~> 2.4.0)
463471
selenium-webdriver
464472
sentry-raven
465473
simple_form
466474
simplecov
467-
therubyracer (~> 0.12.0)
468475
tinymce-rails (~> 5.6)
469476
tinymce-rails-langs (~> 5.20200505)
470477
traco
471478
uglifier
472479
unicorn
473-
validates_timeliness (~> 5.0)
480+
validates_timeliness
474481
web-console
482+
webrick (~> 1.8)
475483
whenever
476484
will_paginate (~> 3.3)
477485
will_paginate-bootstrap
478486

479487
RUBY VERSION
480-
ruby 2.7.4p191
488+
ruby 3.1.4p223
481489

482490
BUNDLED WITH
483-
2.1.4
491+
2.4.20

0 commit comments

Comments
 (0)