Skip to content

Commit e67aeb5

Browse files
committed
allow Rails 6 in gemspec and updated dev and test env to Rails 6
1 parent 11d33c3 commit e67aeb5

File tree

3 files changed

+64
-48
lines changed

3 files changed

+64
-48
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ group :development, :test do
2121
gem 'rspec-rails', '~> 3.8'
2222
gem 'capybara'
2323
gem 'webpacker', '~> 4.0'
24-
gem 'sqlite3', '~> 1.3.13'
24+
gem 'sqlite3', '~> 1.4'
2525
gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
2626
gem 'puma'
2727
gem 'simplecov', require: false, group: :test

Gemfile.lock

Lines changed: 62 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,71 @@ PATH
55
cells-haml
66
cells-rails
77
haml
8-
rails (~> 5.0)
8+
rails (>= 5.0)
99
trailblazer
1010
trailblazer-cells
1111
trailblazer-rails (= 1.0.9)
1212

1313
GEM
1414
remote: https://rubygems.org/
1515
specs:
16-
actioncable (5.2.4.2)
17-
actionpack (= 5.2.4.2)
16+
actioncable (6.0.2.2)
17+
actionpack (= 6.0.2.2)
1818
nio4r (~> 2.0)
1919
websocket-driver (>= 0.6.1)
20-
actionmailer (5.2.4.2)
21-
actionpack (= 5.2.4.2)
22-
actionview (= 5.2.4.2)
23-
activejob (= 5.2.4.2)
20+
actionmailbox (6.0.2.2)
21+
actionpack (= 6.0.2.2)
22+
activejob (= 6.0.2.2)
23+
activerecord (= 6.0.2.2)
24+
activestorage (= 6.0.2.2)
25+
activesupport (= 6.0.2.2)
26+
mail (>= 2.7.1)
27+
actionmailer (6.0.2.2)
28+
actionpack (= 6.0.2.2)
29+
actionview (= 6.0.2.2)
30+
activejob (= 6.0.2.2)
2431
mail (~> 2.5, >= 2.5.4)
2532
rails-dom-testing (~> 2.0)
26-
actionpack (5.2.4.2)
27-
actionview (= 5.2.4.2)
28-
activesupport (= 5.2.4.2)
33+
actionpack (6.0.2.2)
34+
actionview (= 6.0.2.2)
35+
activesupport (= 6.0.2.2)
2936
rack (~> 2.0, >= 2.0.8)
3037
rack-test (>= 0.6.3)
3138
rails-dom-testing (~> 2.0)
32-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
33-
actionview (5.2.4.2)
34-
activesupport (= 5.2.4.2)
39+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
40+
actiontext (6.0.2.2)
41+
actionpack (= 6.0.2.2)
42+
activerecord (= 6.0.2.2)
43+
activestorage (= 6.0.2.2)
44+
activesupport (= 6.0.2.2)
45+
nokogiri (>= 1.8.5)
46+
actionview (6.0.2.2)
47+
activesupport (= 6.0.2.2)
3548
builder (~> 3.1)
3649
erubi (~> 1.4)
3750
rails-dom-testing (~> 2.0)
38-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
39-
activejob (5.2.4.2)
40-
activesupport (= 5.2.4.2)
51+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
52+
activejob (6.0.2.2)
53+
activesupport (= 6.0.2.2)
4154
globalid (>= 0.3.6)
42-
activemodel (5.2.4.2)
43-
activesupport (= 5.2.4.2)
44-
activerecord (5.2.4.2)
45-
activemodel (= 5.2.4.2)
46-
activesupport (= 5.2.4.2)
47-
arel (>= 9.0)
48-
activestorage (5.2.4.2)
49-
actionpack (= 5.2.4.2)
50-
activerecord (= 5.2.4.2)
55+
activemodel (6.0.2.2)
56+
activesupport (= 6.0.2.2)
57+
activerecord (6.0.2.2)
58+
activemodel (= 6.0.2.2)
59+
activesupport (= 6.0.2.2)
60+
activestorage (6.0.2.2)
61+
actionpack (= 6.0.2.2)
62+
activejob (= 6.0.2.2)
63+
activerecord (= 6.0.2.2)
5164
marcel (~> 0.3.1)
52-
activesupport (5.2.4.2)
65+
activesupport (6.0.2.2)
5366
concurrent-ruby (~> 1.0, >= 1.0.2)
5467
i18n (>= 0.7, < 2)
5568
minitest (~> 5.1)
5669
tzinfo (~> 1.1)
70+
zeitwerk (~> 2.2)
5771
addressable (2.7.0)
5872
public_suffix (>= 2.0.2, < 5.0)
59-
arel (9.0.0)
6073
builder (3.2.4)
6174
byebug (11.1.1)
6275
capybara (3.31.0)
@@ -108,7 +121,7 @@ GEM
108121
hashdiff (1.0.0)
109122
i18n (1.8.2)
110123
concurrent-ruby (~> 1.0)
111-
loofah (2.4.0)
124+
loofah (2.5.0)
112125
crass (~> 1.0.2)
113126
nokogiri (>= 1.5.9)
114127
mail (2.7.1)
@@ -140,30 +153,32 @@ GEM
140153
rack
141154
rack-test (1.1.0)
142155
rack (>= 1.0, < 3)
143-
rails (5.2.4.2)
144-
actioncable (= 5.2.4.2)
145-
actionmailer (= 5.2.4.2)
146-
actionpack (= 5.2.4.2)
147-
actionview (= 5.2.4.2)
148-
activejob (= 5.2.4.2)
149-
activemodel (= 5.2.4.2)
150-
activerecord (= 5.2.4.2)
151-
activestorage (= 5.2.4.2)
152-
activesupport (= 5.2.4.2)
156+
rails (6.0.2.2)
157+
actioncable (= 6.0.2.2)
158+
actionmailbox (= 6.0.2.2)
159+
actionmailer (= 6.0.2.2)
160+
actionpack (= 6.0.2.2)
161+
actiontext (= 6.0.2.2)
162+
actionview (= 6.0.2.2)
163+
activejob (= 6.0.2.2)
164+
activemodel (= 6.0.2.2)
165+
activerecord (= 6.0.2.2)
166+
activestorage (= 6.0.2.2)
167+
activesupport (= 6.0.2.2)
153168
bundler (>= 1.3.0)
154-
railties (= 5.2.4.2)
169+
railties (= 6.0.2.2)
155170
sprockets-rails (>= 2.0.0)
156171
rails-dom-testing (2.0.3)
157172
activesupport (>= 4.2.0)
158173
nokogiri (>= 1.6)
159174
rails-html-sanitizer (1.3.0)
160175
loofah (~> 2.3)
161-
railties (5.2.4.2)
162-
actionpack (= 5.2.4.2)
163-
activesupport (= 5.2.4.2)
176+
railties (6.0.2.2)
177+
actionpack (= 6.0.2.2)
178+
activesupport (= 6.0.2.2)
164179
method_source
165180
rake (>= 0.8.7)
166-
thor (>= 0.19.0, < 2.0)
181+
thor (>= 0.20.3, < 2.0)
167182
rake (13.0.1)
168183
reform (2.2.4)
169184
disposable (>= 0.4.1)
@@ -217,7 +232,7 @@ GEM
217232
actionpack (>= 4.0)
218233
activesupport (>= 4.0)
219234
sprockets (>= 3.0.0)
220-
sqlite3 (1.3.13)
235+
sqlite3 (1.4.2)
221236
temple (0.8.2)
222237
thor (1.0.1)
223238
thread_safe (0.3.6)
@@ -240,7 +255,7 @@ GEM
240255
turbolinks (5.2.1)
241256
turbolinks-source (~> 5.2)
242257
turbolinks-source (5.2.0)
243-
tzinfo (1.2.6)
258+
tzinfo (1.2.7)
244259
thread_safe (~> 0.1)
245260
uber (0.1.0)
246261
webmock (3.8.1)
@@ -256,6 +271,7 @@ GEM
256271
websocket-extensions (0.1.4)
257272
xpath (3.2.0)
258273
nokogiri (~> 1.8)
274+
zeitwerk (2.3.0)
259275

260276
PLATFORMS
261277
ruby
@@ -275,7 +291,7 @@ DEPENDENCIES
275291
rspec-wait (~> 0.0.9)
276292
selenium-webdriver (~> 3.142, >= 3.142.7)
277293
simplecov
278-
sqlite3 (~> 1.3.13)
294+
sqlite3 (~> 1.4)
279295
trailblazer
280296
trailblazer-cells
281297
trailblazer-rails

matestack-ui-core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
1717

1818
s.files = Dir["{app,config,db,lib,vendor}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
1919

20-
s.add_dependency "rails", '~> 5.0'
20+
s.add_dependency "rails", '>= 5.0'
2121
s.add_dependency "haml"
2222
s.add_dependency "trailblazer"
2323
s.add_dependency "trailblazer-rails", "1.0.9"

0 commit comments

Comments
 (0)