Skip to content

Commit 9c6b404

Browse files
authored
chore(maintenance): upgrade ruby, rails and dependencies to LTS (#ayuy7g) (#387)
1 parent a2786e5 commit 9c6b404

35 files changed

+199
-164
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ build/
3333
# for a library or gem, you might want to ignore these files since the code is
3434
# intended to run in multiple environments; otherwise, check them in:
3535
# Gemfile.lock
36-
# .ruby-version
36+
.ruby-version
3737
# .ruby-gemset
3838

3939
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
script: commitlint-travis
1515
- stage: Tests
1616
language: ruby
17-
rvm: 2.3.4
17+
before_install: gem install bundler -v '2.1.4'
18+
rvm: 2.7.2
1819
script:
1920
- RAILS_ENV=test bundle exec rake test
2021
- RAILS_ENV=test bundle exec rake db:migrate && bundle exec rspec --color --format doc

Gemfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ end
1818

1919
group :test do
2020
gem 'rake'
21-
gem 'sqlite3', '1.3.13'
21+
gem 'sqlite3', '~> 1.4'
2222
gem 'simplecov', require: false
2323
end
2424

25-
gem 'rails', '4.2.7.1'
25+
gem 'rails', '6.0.3.4'
2626
gem 'jsonapi-serializers', '1.0.1'
2727
gem 'rack-cors'
28-
gem 'arel-helpers', '2.10.0'
28+
gem 'arel-helpers', '2.11.0'
2929
gem 'groupdate', '2.5.2'
3030
gem 'useragent'
3131
gem 'jwt'
3232
gem 'bcrypt'
33-
gem 'base32', '0.3.2'
34-
gem 'rotp', '3.1'
35-
gem 'httparty', '0.13.7'
33+
gem 'base32', '0.3.4'
34+
gem 'rotp', '6.2.0'
35+
gem 'httparty', '0.18.1'
3636
gem 'ipaddress', '0.8.3'

Gemfile.lock

Lines changed: 130 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -18,114 +18,143 @@ PATH
1818
GEM
1919
remote: https://rubygems.org/
2020
specs:
21-
actionmailer (4.2.7.1)
22-
actionpack (= 4.2.7.1)
23-
actionview (= 4.2.7.1)
24-
activejob (= 4.2.7.1)
21+
actioncable (6.0.3.4)
22+
actionpack (= 6.0.3.4)
23+
nio4r (~> 2.0)
24+
websocket-driver (>= 0.6.1)
25+
actionmailbox (6.0.3.4)
26+
actionpack (= 6.0.3.4)
27+
activejob (= 6.0.3.4)
28+
activerecord (= 6.0.3.4)
29+
activestorage (= 6.0.3.4)
30+
activesupport (= 6.0.3.4)
31+
mail (>= 2.7.1)
32+
actionmailer (6.0.3.4)
33+
actionpack (= 6.0.3.4)
34+
actionview (= 6.0.3.4)
35+
activejob (= 6.0.3.4)
2536
mail (~> 2.5, >= 2.5.4)
26-
rails-dom-testing (~> 1.0, >= 1.0.5)
27-
actionpack (4.2.7.1)
28-
actionview (= 4.2.7.1)
29-
activesupport (= 4.2.7.1)
30-
rack (~> 1.6)
31-
rack-test (~> 0.6.2)
32-
rails-dom-testing (~> 1.0, >= 1.0.5)
33-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
34-
actionview (4.2.7.1)
35-
activesupport (= 4.2.7.1)
37+
rails-dom-testing (~> 2.0)
38+
actionpack (6.0.3.4)
39+
actionview (= 6.0.3.4)
40+
activesupport (= 6.0.3.4)
41+
rack (~> 2.0, >= 2.0.8)
42+
rack-test (>= 0.6.3)
43+
rails-dom-testing (~> 2.0)
44+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
45+
actiontext (6.0.3.4)
46+
actionpack (= 6.0.3.4)
47+
activerecord (= 6.0.3.4)
48+
activestorage (= 6.0.3.4)
49+
activesupport (= 6.0.3.4)
50+
nokogiri (>= 1.8.5)
51+
actionview (6.0.3.4)
52+
activesupport (= 6.0.3.4)
3653
builder (~> 3.1)
37-
erubis (~> 2.7.0)
38-
rails-dom-testing (~> 1.0, >= 1.0.5)
39-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
40-
activejob (4.2.7.1)
41-
activesupport (= 4.2.7.1)
42-
globalid (>= 0.3.0)
43-
activemodel (4.2.7.1)
44-
activesupport (= 4.2.7.1)
45-
builder (~> 3.1)
46-
activerecord (4.2.7.1)
47-
activemodel (= 4.2.7.1)
48-
activesupport (= 4.2.7.1)
49-
arel (~> 6.0)
50-
activesupport (4.2.7.1)
51-
i18n (~> 0.7)
52-
json (~> 1.7, >= 1.7.7)
54+
erubi (~> 1.4)
55+
rails-dom-testing (~> 2.0)
56+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
57+
activejob (6.0.3.4)
58+
activesupport (= 6.0.3.4)
59+
globalid (>= 0.3.6)
60+
activemodel (6.0.3.4)
61+
activesupport (= 6.0.3.4)
62+
activerecord (6.0.3.4)
63+
activemodel (= 6.0.3.4)
64+
activesupport (= 6.0.3.4)
65+
activestorage (6.0.3.4)
66+
actionpack (= 6.0.3.4)
67+
activejob (= 6.0.3.4)
68+
activerecord (= 6.0.3.4)
69+
marcel (~> 0.3.1)
70+
activesupport (6.0.3.4)
71+
concurrent-ruby (~> 1.0, >= 1.0.2)
72+
i18n (>= 0.7, < 2)
5373
minitest (~> 5.1)
54-
thread_safe (~> 0.3, >= 0.3.4)
5574
tzinfo (~> 1.1)
56-
arel (6.0.4)
57-
arel-helpers (2.10.0)
75+
zeitwerk (~> 2.2, >= 2.2.2)
76+
arel-helpers (2.11.0)
5877
activerecord (>= 3.1.0, < 7)
59-
base32 (0.3.2)
60-
bcrypt (3.1.10)
61-
builder (3.2.3)
62-
byebug (8.2.2)
63-
concurrent-ruby (1.1.5)
78+
base32 (0.3.4)
79+
bcrypt (3.1.16)
80+
builder (3.2.4)
81+
byebug (11.1.3)
82+
concurrent-ruby (1.1.7)
6483
crass (1.0.6)
65-
diff-lcs (1.3)
84+
diff-lcs (1.4.4)
6685
docile (1.3.2)
67-
erubis (2.7.0)
68-
globalid (0.4.1)
86+
erubi (1.10.0)
87+
globalid (0.4.2)
6988
activesupport (>= 4.2.0)
7089
groupdate (2.5.2)
7190
activesupport (>= 3)
72-
httparty (0.13.7)
73-
json (~> 1.8)
91+
httparty (0.18.1)
92+
mime-types (~> 3.0)
7493
multi_xml (>= 0.5.2)
75-
i18n (0.9.5)
94+
i18n (1.8.5)
7695
concurrent-ruby (~> 1.0)
7796
ipaddress (0.8.3)
78-
json (1.8.6)
7997
jsonapi-serializers (1.0.1)
8098
activesupport
81-
jwt (1.5.4)
99+
jwt (2.2.2)
82100
loofah (2.8.0)
83101
crass (~> 1.0.2)
84102
nokogiri (>= 1.5.9)
85-
mail (2.7.0)
103+
mail (2.7.1)
86104
mini_mime (>= 0.1.1)
87-
mini_mime (1.0.0)
105+
marcel (0.3.3)
106+
mimemagic (~> 0.3.2)
107+
method_source (1.0.0)
108+
mime-types (3.3.1)
109+
mime-types-data (~> 3.2015)
110+
mime-types-data (3.2020.1104)
111+
mimemagic (0.3.5)
112+
mini_mime (1.0.2)
88113
mini_portile2 (2.4.0)
89-
minitest (5.11.3)
114+
minitest (5.14.2)
90115
multi_xml (0.6.0)
116+
nio4r (2.5.4)
91117
nokogiri (1.10.10)
92118
mini_portile2 (~> 2.4.0)
93-
rack (1.6.10)
94-
rack-cors (0.4.0)
95-
rack-test (0.6.3)
96-
rack (>= 1.0)
97-
rails (4.2.7.1)
98-
actionmailer (= 4.2.7.1)
99-
actionpack (= 4.2.7.1)
100-
actionview (= 4.2.7.1)
101-
activejob (= 4.2.7.1)
102-
activemodel (= 4.2.7.1)
103-
activerecord (= 4.2.7.1)
104-
activesupport (= 4.2.7.1)
105-
bundler (>= 1.3.0, < 2.0)
106-
railties (= 4.2.7.1)
107-
sprockets-rails
108-
rails-deprecated_sanitizer (1.0.3)
109-
activesupport (>= 4.2.0.alpha)
110-
rails-dom-testing (1.0.9)
111-
activesupport (>= 4.2.0, < 5.0)
112-
nokogiri (~> 1.6)
113-
rails-deprecated_sanitizer (>= 1.0.1)
119+
rack (2.2.3)
120+
rack-cors (1.1.1)
121+
rack (>= 2.0.0)
122+
rack-test (1.1.0)
123+
rack (>= 1.0, < 3)
124+
rails (6.0.3.4)
125+
actioncable (= 6.0.3.4)
126+
actionmailbox (= 6.0.3.4)
127+
actionmailer (= 6.0.3.4)
128+
actionpack (= 6.0.3.4)
129+
actiontext (= 6.0.3.4)
130+
actionview (= 6.0.3.4)
131+
activejob (= 6.0.3.4)
132+
activemodel (= 6.0.3.4)
133+
activerecord (= 6.0.3.4)
134+
activestorage (= 6.0.3.4)
135+
activesupport (= 6.0.3.4)
136+
bundler (>= 1.3.0)
137+
railties (= 6.0.3.4)
138+
sprockets-rails (>= 2.0.0)
139+
rails-dom-testing (2.0.3)
140+
activesupport (>= 4.2.0)
141+
nokogiri (>= 1.6)
114142
rails-html-sanitizer (1.3.0)
115143
loofah (~> 2.3)
116-
railties (4.2.7.1)
117-
actionpack (= 4.2.7.1)
118-
activesupport (= 4.2.7.1)
144+
railties (6.0.3.4)
145+
actionpack (= 6.0.3.4)
146+
activesupport (= 6.0.3.4)
147+
method_source
119148
rake (>= 0.8.7)
120-
thor (>= 0.18.1, < 2.0)
149+
thor (>= 0.20.3, < 2.0)
121150
rake (13.0.1)
122-
rotp (3.1.0)
123-
rspec-core (3.8.0)
151+
rotp (6.2.0)
152+
rspec-core (3.8.2)
124153
rspec-support (~> 3.8.0)
125-
rspec-expectations (3.8.2)
154+
rspec-expectations (3.8.6)
126155
diff-lcs (>= 1.2.0, < 2.0)
127156
rspec-support (~> 3.8.0)
128-
rspec-mocks (3.8.0)
157+
rspec-mocks (3.8.2)
129158
diff-lcs (>= 1.2.0, < 2.0)
130159
rspec-support (~> 3.8.0)
131160
rspec-rails (3.8.2)
@@ -136,48 +165,53 @@ GEM
136165
rspec-expectations (~> 3.8.0)
137166
rspec-mocks (~> 3.8.0)
138167
rspec-support (~> 3.8.0)
139-
rspec-support (3.8.0)
140-
simplecov (0.17.1)
168+
rspec-support (3.8.3)
169+
simplecov (0.20.0)
141170
docile (~> 1.1)
142-
json (>= 1.8, < 3)
143-
simplecov-html (~> 0.10.0)
144-
simplecov-html (0.10.2)
145-
sprockets (3.7.2)
171+
simplecov-html (~> 0.11)
172+
simplecov_json_formatter (~> 0.1)
173+
simplecov-html (0.12.3)
174+
simplecov_json_formatter (0.1.2)
175+
sprockets (4.0.2)
146176
concurrent-ruby (~> 1.0)
147177
rack (> 1, < 3)
148-
sprockets-rails (3.2.1)
178+
sprockets-rails (3.2.2)
149179
actionpack (>= 4.0)
150180
activesupport (>= 4.0)
151181
sprockets (>= 3.0.0)
152-
sqlite3 (1.3.13)
153-
thor (0.20.0)
182+
sqlite3 (1.4.2)
183+
thor (1.0.1)
154184
thread_safe (0.3.6)
155-
tzinfo (1.2.5)
185+
tzinfo (1.2.8)
156186
thread_safe (~> 0.1)
157-
useragent (0.16.5)
187+
useragent (0.16.10)
188+
websocket-driver (0.7.3)
189+
websocket-extensions (>= 0.1.0)
190+
websocket-extensions (0.1.5)
191+
zeitwerk (2.4.2)
158192

159193
PLATFORMS
160194
ruby
161195

162196
DEPENDENCIES
163-
arel-helpers (= 2.10.0)
164-
base32 (= 0.3.2)
197+
arel-helpers (= 2.11.0)
198+
base32 (= 0.3.4)
165199
bcrypt
166200
byebug
167201
forest_liana!
168202
groupdate (= 2.5.2)
169-
httparty (= 0.13.7)
203+
httparty (= 0.18.1)
170204
ipaddress (= 0.8.3)
171205
jsonapi-serializers (= 1.0.1)
172206
jwt
173207
rack-cors
174-
rails (= 4.2.7.1)
208+
rails (= 6.0.3.4)
175209
rake
176-
rotp (= 3.1)
210+
rotp (= 6.2.0)
177211
rspec-rails (= 3.8.2)
178212
simplecov
179-
sqlite3 (= 1.3.13)
213+
sqlite3 (~> 1.4)
180214
useragent
181215

182216
BUNDLED WITH
183-
1.17.3
217+
2.1.4
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

spec/dummy/config/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Application < Rails::Application
2020
# config.i18n.default_locale = :de
2121

2222
# Do not swallow errors in after_commit/after_rollback callbacks.
23-
config.active_record.raise_in_transactional_callbacks = true
23+
# config.active_record.raise_in_transactional_callbacks = true
2424
end
2525
end
2626

spec/dummy/db/migrate/20190226172951_create_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class CreateUser < ActiveRecord::Migration
1+
class CreateUser < ActiveRecord::Migration[4.2]
22
def change
33
create_table :users do |t|
44
t.string :name

spec/dummy/db/migrate/20190226173051_create_isle.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class CreateIsle < ActiveRecord::Migration
1+
class CreateIsle < ActiveRecord::Migration[4.2]
22
def change
33
create_table :isle do |t|
44
t.string :name

spec/dummy/db/migrate/20190226174951_create_tree.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class CreateTree < ActiveRecord::Migration
1+
class CreateTree < ActiveRecord::Migration[4.2]
22
def change
33
create_table :trees do |t|
44
t.string :name

spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class AddAgeToTree < ActiveRecord::Migration
1+
class AddAgeToTree < ActiveRecord::Migration[4.2]
22
def up
33
add_column :trees, :age, :integer
44
end

0 commit comments

Comments
 (0)