Skip to content

Commit b4e348f

Browse files
JPrevostjazairi
JPrevost
authored and
jazairi
committed
Add support for Rails 6 apps
Why these changes are being introduced: Version 0.4.0 doesn't support Rails 6 apps, so we can't use it with the new version of Thing. Relevant ticket(s): * https://mitlibraries.atlassian.net/browse/ETD-222 How this addresses that need: Upgrades to Rails 6. Side effects of this change: Other gem dependencies have been updated.
1 parent 2bf1f20 commit b4e348f

3 files changed

Lines changed: 87 additions & 83 deletions

File tree

‎Gemfile.lock‎

Lines changed: 82 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,77 @@
11
PATH
22
remote: .
33
specs:
4-
mitlibraries-theme (0.4.0)
5-
rails (~> 5)
6-
sass (~> 3.4)
7-
sass-rails (~> 5)
4+
mitlibraries-theme (0.5.0)
5+
rails (>= 5, < 7)
6+
sassc (~> 2)
87

98
GEM
109
remote: https://rubygems.org/
1110
specs:
12-
actioncable (5.2.4.5)
13-
actionpack (= 5.2.4.5)
11+
actioncable (6.1.3)
12+
actionpack (= 6.1.3)
13+
activesupport (= 6.1.3)
1414
nio4r (~> 2.0)
1515
websocket-driver (>= 0.6.1)
16-
actionmailer (5.2.4.5)
17-
actionpack (= 5.2.4.5)
18-
actionview (= 5.2.4.5)
19-
activejob (= 5.2.4.5)
16+
actionmailbox (6.1.3)
17+
actionpack (= 6.1.3)
18+
activejob (= 6.1.3)
19+
activerecord (= 6.1.3)
20+
activestorage (= 6.1.3)
21+
activesupport (= 6.1.3)
22+
mail (>= 2.7.1)
23+
actionmailer (6.1.3)
24+
actionpack (= 6.1.3)
25+
actionview (= 6.1.3)
26+
activejob (= 6.1.3)
27+
activesupport (= 6.1.3)
2028
mail (~> 2.5, >= 2.5.4)
2129
rails-dom-testing (~> 2.0)
22-
actionpack (5.2.4.5)
23-
actionview (= 5.2.4.5)
24-
activesupport (= 5.2.4.5)
25-
rack (~> 2.0, >= 2.0.8)
30+
actionpack (6.1.3)
31+
actionview (= 6.1.3)
32+
activesupport (= 6.1.3)
33+
rack (~> 2.0, >= 2.0.9)
2634
rack-test (>= 0.6.3)
2735
rails-dom-testing (~> 2.0)
28-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
29-
actionview (5.2.4.5)
30-
activesupport (= 5.2.4.5)
36+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
37+
actiontext (6.1.3)
38+
actionpack (= 6.1.3)
39+
activerecord (= 6.1.3)
40+
activestorage (= 6.1.3)
41+
activesupport (= 6.1.3)
42+
nokogiri (>= 1.8.5)
43+
actionview (6.1.3)
44+
activesupport (= 6.1.3)
3145
builder (~> 3.1)
3246
erubi (~> 1.4)
3347
rails-dom-testing (~> 2.0)
34-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
35-
activejob (5.2.4.5)
36-
activesupport (= 5.2.4.5)
48+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49+
activejob (6.1.3)
50+
activesupport (= 6.1.3)
3751
globalid (>= 0.3.6)
38-
activemodel (5.2.4.5)
39-
activesupport (= 5.2.4.5)
40-
activerecord (5.2.4.5)
41-
activemodel (= 5.2.4.5)
42-
activesupport (= 5.2.4.5)
43-
arel (>= 9.0)
44-
activestorage (5.2.4.5)
45-
actionpack (= 5.2.4.5)
46-
activerecord (= 5.2.4.5)
52+
activemodel (6.1.3)
53+
activesupport (= 6.1.3)
54+
activerecord (6.1.3)
55+
activemodel (= 6.1.3)
56+
activesupport (= 6.1.3)
57+
activestorage (6.1.3)
58+
actionpack (= 6.1.3)
59+
activejob (= 6.1.3)
60+
activerecord (= 6.1.3)
61+
activesupport (= 6.1.3)
4762
marcel (~> 0.3.1)
48-
activesupport (5.2.4.5)
63+
mimemagic (~> 0.3.2)
64+
activesupport (6.1.3)
4965
concurrent-ruby (~> 1.0, >= 1.0.2)
50-
i18n (>= 0.7, < 2)
51-
minitest (~> 5.1)
52-
tzinfo (~> 1.1)
53-
arel (9.0.0)
66+
i18n (>= 1.6, < 2)
67+
minitest (>= 5.1)
68+
tzinfo (~> 2.0)
69+
zeitwerk (~> 2.3)
5470
builder (3.2.4)
5571
concurrent-ruby (1.1.8)
5672
crass (1.0.6)
5773
erubi (1.10.0)
58-
ffi (1.13.1)
74+
ffi (1.15.0)
5975
globalid (0.4.2)
6076
activesupport (>= 4.2.0)
6177
i18n (1.8.9)
@@ -68,81 +84,70 @@ GEM
6884
marcel (0.3.3)
6985
mimemagic (~> 0.3.2)
7086
method_source (1.0.0)
71-
mimemagic (0.3.5)
87+
mimemagic (0.3.6)
7288
mini_mime (1.0.2)
7389
mini_portile2 (2.5.0)
74-
minitest (5.14.2)
75-
nio4r (2.5.5)
76-
nokogiri (1.11.1)
90+
minitest (5.14.4)
91+
nio4r (2.5.7)
92+
nokogiri (1.11.2)
7793
mini_portile2 (~> 2.5.0)
7894
racc (~> 1.4)
7995
racc (1.5.2)
8096
rack (2.2.3)
8197
rack-test (1.1.0)
8298
rack (>= 1.0, < 3)
83-
rails (5.2.4.5)
84-
actioncable (= 5.2.4.5)
85-
actionmailer (= 5.2.4.5)
86-
actionpack (= 5.2.4.5)
87-
actionview (= 5.2.4.5)
88-
activejob (= 5.2.4.5)
89-
activemodel (= 5.2.4.5)
90-
activerecord (= 5.2.4.5)
91-
activestorage (= 5.2.4.5)
92-
activesupport (= 5.2.4.5)
93-
bundler (>= 1.3.0)
94-
railties (= 5.2.4.5)
99+
rails (6.1.3)
100+
actioncable (= 6.1.3)
101+
actionmailbox (= 6.1.3)
102+
actionmailer (= 6.1.3)
103+
actionpack (= 6.1.3)
104+
actiontext (= 6.1.3)
105+
actionview (= 6.1.3)
106+
activejob (= 6.1.3)
107+
activemodel (= 6.1.3)
108+
activerecord (= 6.1.3)
109+
activestorage (= 6.1.3)
110+
activesupport (= 6.1.3)
111+
bundler (>= 1.15.0)
112+
railties (= 6.1.3)
95113
sprockets-rails (>= 2.0.0)
96114
rails-dom-testing (2.0.3)
97115
activesupport (>= 4.2.0)
98116
nokogiri (>= 1.6)
99117
rails-html-sanitizer (1.3.0)
100118
loofah (~> 2.3)
101-
railties (5.2.4.5)
102-
actionpack (= 5.2.4.5)
103-
activesupport (= 5.2.4.5)
119+
railties (6.1.3)
120+
actionpack (= 6.1.3)
121+
activesupport (= 6.1.3)
104122
method_source
105123
rake (>= 0.8.7)
106-
thor (>= 0.19.0, < 2.0)
107-
rake (13.0.1)
108-
rb-fsevent (0.10.4)
109-
rb-inotify (0.10.1)
110-
ffi (~> 1.0)
111-
sass (3.7.4)
112-
sass-listen (~> 4.0.0)
113-
sass-listen (4.0.0)
114-
rb-fsevent (~> 0.9, >= 0.9.4)
115-
rb-inotify (~> 0.9, >= 0.9.7)
116-
sass-rails (5.1.0)
117-
railties (>= 5.2.0)
118-
sass (~> 3.1)
119-
sprockets (>= 2.8, < 4.0)
120-
sprockets-rails (>= 2.0, < 4.0)
121-
tilt (>= 1.1, < 3)
122-
sprockets (3.7.2)
124+
thor (~> 1.0)
125+
rake (13.0.3)
126+
sassc (2.4.0)
127+
ffi (~> 1.9)
128+
sprockets (4.0.2)
123129
concurrent-ruby (~> 1.0)
124130
rack (> 1, < 3)
125131
sprockets-rails (3.2.2)
126132
actionpack (>= 4.0)
127133
activesupport (>= 4.0)
128134
sprockets (>= 3.0.0)
129135
thor (1.1.0)
130-
thread_safe (0.3.6)
131-
tilt (2.0.10)
132-
tzinfo (1.2.9)
133-
thread_safe (~> 0.1)
136+
tzinfo (2.0.4)
137+
concurrent-ruby (~> 1.0)
134138
websocket-driver (0.7.3)
135139
websocket-extensions (>= 0.1.0)
136140
websocket-extensions (0.1.5)
141+
zeitwerk (2.4.2)
137142

138143
PLATFORMS
139144
ruby
140145

141146
DEPENDENCIES
142-
bundler (~> 2)
147+
bundler (~> 2.0)
143148
minitest (~> 5.0)
144149
mitlibraries-theme!
145-
rake (>= 12.3.3)
150+
rake (~> 13.0)
146151

147152
BUNDLED WITH
148153
2.1.4

‎lib/mitlibraries/theme/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Mitlibraries
22
module Theme
3-
VERSION = '0.4.0'.freeze
3+
VERSION = '0.5.0'.freeze
44
end
55
end

‎mitlibraries-theme.gemspec‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
2020
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2121
spec.require_paths = ['lib']
2222

23-
spec.add_development_dependency 'bundler', '~> 2'
23+
spec.add_development_dependency 'bundler', '~> 2.0'
2424
spec.add_development_dependency 'minitest', '~> 5.0'
25-
spec.add_development_dependency "rake", ">= 12.3.3"
26-
spec.add_dependency 'rails', '~> 5'
27-
spec.add_dependency 'sass', '~> 3.4'
28-
spec.add_dependency 'sass-rails', '~> 5'
25+
spec.add_development_dependency 'rake', '~> 13.0'
26+
spec.add_dependency 'rails', '>= 5', '<7'
27+
spec.add_dependency 'sassc', '~> 2'
2928
end

0 commit comments

Comments
 (0)