Skip to content

Commit 0947617

Browse files
committed
bundle installing with Ruby 3.0.x
1 parent 2d45935 commit 0947617

5 files changed

Lines changed: 135 additions & 113 deletions

File tree

Gemfile.lock

Lines changed: 129 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PATH
88
remote: .
99
specs:
1010
activeadmin-mongoid (1.0.0)
11-
activeadmin (>= 1.4.3)
11+
activeadmin (>= 1.3.0, <= 2.6.0)
1212
jquery-rails
1313
kaminari-mongoid
1414
mongoid (>= 6.0, < 8.a)
@@ -17,25 +17,25 @@ PATH
1717
GEM
1818
remote: https://rubygems.org/
1919
specs:
20-
actioncable (5.2.3)
21-
actionpack (= 5.2.3)
20+
actioncable (5.2.8.1)
21+
actionpack (= 5.2.8.1)
2222
nio4r (~> 2.0)
2323
websocket-driver (>= 0.6.1)
24-
actionmailer (5.2.3)
25-
actionpack (= 5.2.3)
26-
actionview (= 5.2.3)
27-
activejob (= 5.2.3)
24+
actionmailer (5.2.8.1)
25+
actionpack (= 5.2.8.1)
26+
actionview (= 5.2.8.1)
27+
activejob (= 5.2.8.1)
2828
mail (~> 2.5, >= 2.5.4)
2929
rails-dom-testing (~> 2.0)
30-
actionpack (5.2.3)
31-
actionview (= 5.2.3)
32-
activesupport (= 5.2.3)
33-
rack (~> 2.0)
30+
actionpack (5.2.8.1)
31+
actionview (= 5.2.8.1)
32+
activesupport (= 5.2.8.1)
33+
rack (~> 2.0, >= 2.0.8)
3434
rack-test (>= 0.6.3)
3535
rails-dom-testing (~> 2.0)
3636
rails-html-sanitizer (~> 1.0, >= 1.0.2)
37-
actionview (5.2.3)
38-
activesupport (= 5.2.3)
37+
actionview (5.2.8.1)
38+
activesupport (= 5.2.8.1)
3939
builder (~> 3.1)
4040
erubi (~> 1.4)
4141
rails-dom-testing (~> 2.0)
@@ -51,45 +51,48 @@ GEM
5151
ransack (~> 2.1, >= 2.1.1)
5252
sassc-rails (~> 2.1)
5353
sprockets (>= 3.0, < 4.1)
54-
activejob (5.2.3)
55-
activesupport (= 5.2.3)
54+
activejob (5.2.8.1)
55+
activesupport (= 5.2.8.1)
5656
globalid (>= 0.3.6)
57-
activemodel (5.2.3)
58-
activesupport (= 5.2.3)
59-
activerecord (5.2.3)
60-
activemodel (= 5.2.3)
61-
activesupport (= 5.2.3)
57+
activemodel (5.2.8.1)
58+
activesupport (= 5.2.8.1)
59+
activerecord (5.2.8.1)
60+
activemodel (= 5.2.8.1)
61+
activesupport (= 5.2.8.1)
6262
arel (>= 9.0)
63-
activestorage (5.2.3)
64-
actionpack (= 5.2.3)
65-
activerecord (= 5.2.3)
66-
marcel (~> 0.3.1)
67-
activesupport (5.2.3)
63+
activestorage (5.2.8.1)
64+
actionpack (= 5.2.8.1)
65+
activerecord (= 5.2.8.1)
66+
marcel (~> 1.0.0)
67+
activesupport (5.2.8.1)
6868
concurrent-ruby (~> 1.0, >= 1.0.2)
6969
i18n (>= 0.7, < 2)
7070
minitest (~> 5.1)
7171
tzinfo (~> 1.1)
72-
addressable (2.5.2)
73-
public_suffix (>= 2.0.2, < 4.0)
74-
arbre (1.2.1)
72+
addressable (2.8.7)
73+
public_suffix (>= 2.0.2, < 7.0)
74+
arbre (1.7.0)
7575
activesupport (>= 3.0.0)
76+
ruby2_keywords (>= 0.0.2)
7677
arel (9.0.0)
7778
ast (2.4.0)
7879
bcrypt (3.1.13)
79-
bson (4.7.1)
80-
builder (3.2.4)
81-
capybara (3.12.0)
80+
bson (5.0.1)
81+
builder (3.3.0)
82+
capybara (3.40.0)
8283
addressable
84+
matrix
8385
mini_mime (>= 0.1.3)
84-
nokogiri (~> 1.8)
86+
nokogiri (~> 1.11)
8587
rack (>= 1.6.0)
8688
rack-test (>= 0.6.3)
87-
regexp_parser (~> 1.2)
89+
regexp_parser (>= 1.5, < 3.0)
8890
xpath (~> 3.2)
8991
cliver (0.3.2)
9092
coderay (1.1.2)
91-
concurrent-ruby (1.1.6)
93+
concurrent-ruby (1.3.4)
9294
crass (1.0.6)
95+
date (3.3.4)
9396
devise (4.7.1)
9497
bcrypt (~> 3.0)
9598
orm_adapter (~> 0.1)
@@ -98,24 +101,24 @@ GEM
98101
warden (~> 1.2.3)
99102
diff-lcs (1.3)
100103
docile (1.3.1)
101-
erubi (1.9.0)
102-
ffi (1.12.1)
104+
erubi (1.13.0)
105+
ffi (1.17.0)
103106
formtastic (3.1.5)
104107
actionpack (>= 3.2.13)
105-
formtastic_i18n (0.6.0)
106-
globalid (0.4.2)
107-
activesupport (>= 4.2.0)
108-
has_scope (0.7.2)
109-
actionpack (>= 4.1)
110-
activesupport (>= 4.1)
111-
i18n (1.8.2)
108+
formtastic_i18n (0.7.0)
109+
globalid (1.1.0)
110+
activesupport (>= 5.0)
111+
has_scope (0.8.2)
112+
actionpack (>= 5.2)
113+
activesupport (>= 5.2)
114+
i18n (1.14.5)
112115
concurrent-ruby (~> 1.0)
113-
inherited_resources (1.11.0)
114-
actionpack (>= 5.0, < 6.1)
116+
inherited_resources (1.13.1)
117+
actionpack (>= 5.2, < 7.1)
115118
has_scope (~> 0.6)
116-
railties (>= 5.0, < 6.1)
119+
railties (>= 5.2, < 7.1)
117120
responders (>= 2, < 4)
118-
jaro_winkler (1.5.4)
121+
jaro_winkler (1.5.6)
119122
jquery-rails (4.3.3)
120123
rails-dom-testing (>= 1, < 3)
121124
railties (>= 4.2.0)
@@ -125,45 +128,56 @@ GEM
125128
jslint (1.2.0)
126129
json
127130
json (2.3.1)
128-
kaminari (1.2.1)
131+
kaminari (1.2.2)
129132
activesupport (>= 4.1.0)
130-
kaminari-actionview (= 1.2.1)
131-
kaminari-activerecord (= 1.2.1)
132-
kaminari-core (= 1.2.1)
133-
kaminari-actionview (1.2.1)
133+
kaminari-actionview (= 1.2.2)
134+
kaminari-activerecord (= 1.2.2)
135+
kaminari-core (= 1.2.2)
136+
kaminari-actionview (1.2.2)
134137
actionview
135-
kaminari-core (= 1.2.1)
136-
kaminari-activerecord (1.2.1)
138+
kaminari-core (= 1.2.2)
139+
kaminari-activerecord (1.2.2)
137140
activerecord
138-
kaminari-core (= 1.2.1)
139-
kaminari-core (1.2.1)
140-
kaminari-mongoid (1.0.1)
141+
kaminari-core (= 1.2.2)
142+
kaminari-core (1.2.2)
143+
kaminari-mongoid (1.0.2)
141144
kaminari-core (~> 1.0)
142145
mongoid
143146
launchy (2.4.3)
144147
addressable (~> 2.3)
145-
loofah (2.5.0)
148+
loofah (2.22.0)
146149
crass (~> 1.0.2)
147-
nokogiri (>= 1.5.9)
148-
mail (2.7.1)
150+
nokogiri (>= 1.12.0)
151+
mail (2.8.1)
149152
mini_mime (>= 0.1.1)
150-
marcel (0.3.3)
151-
mimemagic (~> 0.3.2)
153+
net-imap
154+
net-pop
155+
net-smtp
156+
marcel (1.0.4)
157+
matrix (0.4.2)
152158
method_source (0.9.2)
153-
mimemagic (0.3.10)
154-
nokogiri (~> 1)
155-
rake
156-
mini_mime (1.0.1)
157-
mini_portile2 (2.4.0)
158-
minitest (5.14.1)
159-
mongo (2.11.3)
160-
bson (>= 4.4.2, < 5.0.0)
161-
mongoid (7.0.5)
162-
activemodel (>= 5.1, < 6.1)
163-
mongo (>= 2.5.1, < 3.0.0)
164-
nio4r (2.3.1)
165-
nokogiri (1.10.9)
166-
mini_portile2 (~> 2.4.0)
159+
mini_mime (1.1.5)
160+
mini_portile2 (2.8.7)
161+
minitest (5.24.1)
162+
mongo (2.20.1)
163+
bson (>= 4.14.1, < 6.0.0)
164+
mongoid (7.5.4)
165+
activemodel (>= 5.1, < 7.1, != 7.0.0)
166+
mongo (>= 2.10.5, < 3.0.0)
167+
ruby2_keywords (~> 0.0.5)
168+
net-imap (0.4.14)
169+
date
170+
net-protocol
171+
net-pop (0.1.2)
172+
net-protocol
173+
net-protocol (0.2.2)
174+
timeout
175+
net-smtp (0.5.0)
176+
net-protocol
177+
nio4r (2.7.3)
178+
nokogiri (1.16.7)
179+
mini_portile2 (~> 2.8.2)
180+
racc (~> 1.4)
167181
orm_adapter (0.5.0)
168182
parallel (1.19.1)
169183
parser (2.7.0.2)
@@ -179,42 +193,45 @@ GEM
179193
method_source (~> 0.9.0)
180194
pry-rails (0.3.8)
181195
pry (>= 0.10.4)
182-
public_suffix (3.0.3)
183-
rack (2.2.3)
184-
rack-test (1.1.0)
185-
rack (>= 1.0, < 3)
186-
rails (5.2.3)
187-
actioncable (= 5.2.3)
188-
actionmailer (= 5.2.3)
189-
actionpack (= 5.2.3)
190-
actionview (= 5.2.3)
191-
activejob (= 5.2.3)
192-
activemodel (= 5.2.3)
193-
activerecord (= 5.2.3)
194-
activestorage (= 5.2.3)
195-
activesupport (= 5.2.3)
196+
public_suffix (6.0.1)
197+
racc (1.8.1)
198+
rack (2.2.9)
199+
rack-test (2.1.0)
200+
rack (>= 1.3)
201+
rails (5.2.8.1)
202+
actioncable (= 5.2.8.1)
203+
actionmailer (= 5.2.8.1)
204+
actionpack (= 5.2.8.1)
205+
actionview (= 5.2.8.1)
206+
activejob (= 5.2.8.1)
207+
activemodel (= 5.2.8.1)
208+
activerecord (= 5.2.8.1)
209+
activestorage (= 5.2.8.1)
210+
activesupport (= 5.2.8.1)
196211
bundler (>= 1.3.0)
197-
railties (= 5.2.3)
212+
railties (= 5.2.8.1)
198213
sprockets-rails (>= 2.0.0)
199-
rails-dom-testing (2.0.3)
200-
activesupport (>= 4.2.0)
214+
rails-dom-testing (2.2.0)
215+
activesupport (>= 5.0.0)
216+
minitest
201217
nokogiri (>= 1.6)
202-
rails-html-sanitizer (1.3.0)
203-
loofah (~> 2.3)
204-
railties (5.2.3)
205-
actionpack (= 5.2.3)
206-
activesupport (= 5.2.3)
218+
rails-html-sanitizer (1.6.0)
219+
loofah (~> 2.21)
220+
nokogiri (~> 1.14)
221+
railties (5.2.8.1)
222+
actionpack (= 5.2.8.1)
223+
activesupport (= 5.2.8.1)
207224
method_source
208225
rake (>= 0.8.7)
209226
thor (>= 0.19.0, < 2.0)
210227
rainbow (3.0.0)
211-
rake (12.3.3)
228+
rake (13.2.1)
212229
ransack (2.3.2)
213230
activerecord (>= 5.2.1)
214231
activesupport (>= 5.2.1)
215232
i18n
216233
polyamorous (= 2.3.2)
217-
regexp_parser (1.3.0)
234+
regexp_parser (2.9.2)
218235
responders (2.4.1)
219236
actionpack (>= 4.2.0, < 6.0)
220237
railties (>= 4.2.0, < 6.0)
@@ -245,9 +262,10 @@ GEM
245262
ruby-progressbar (~> 1.7)
246263
unicode-display_width (>= 1.4.0, < 1.7)
247264
ruby-progressbar (1.10.1)
265+
ruby2_keywords (0.0.5)
248266
sass-rails (6.0.0)
249267
sassc-rails (~> 2.1, >= 2.1.1)
250-
sassc (2.2.1)
268+
sassc (2.4.0)
251269
ffi (~> 1.9)
252270
sassc-rails (2.1.2)
253271
railties (>= 4.0.0)
@@ -260,22 +278,23 @@ GEM
260278
json (>= 1.8, < 3)
261279
simplecov-html (~> 0.10.0)
262280
simplecov-html (0.10.2)
263-
sprockets (3.7.2)
281+
sprockets (4.0.3)
264282
concurrent-ruby (~> 1.0)
265283
rack (> 1, < 3)
266-
sprockets-rails (3.2.1)
267-
actionpack (>= 4.0)
268-
activesupport (>= 4.0)
284+
sprockets-rails (3.4.2)
285+
actionpack (>= 5.2)
286+
activesupport (>= 5.2)
269287
sprockets (>= 3.0.0)
270-
thor (0.20.3)
288+
thor (1.3.1)
271289
thread_safe (0.3.6)
272-
tilt (2.0.10)
273-
tzinfo (1.2.7)
290+
tilt (2.4.0)
291+
timeout (0.4.1)
292+
tzinfo (1.2.11)
274293
thread_safe (~> 0.1)
275294
unicode-display_width (1.6.1)
276295
warden (1.2.8)
277296
rack (>= 2.0.6)
278-
websocket-driver (0.7.0)
297+
websocket-driver (0.7.6)
279298
websocket-extensions (>= 0.1.0)
280299
websocket-extensions (0.1.5)
281300
xpath (3.2.0)
@@ -301,4 +320,4 @@ DEPENDENCIES
301320
simplecov
302321

303322
BUNDLED WITH
304-
1.17.3
323+
2.5.17

activeadmin-mongoid.gemspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ Gem::Specification.new do |gem|
2020
gem.required_ruby_version = '>= 2.4'
2121

2222
gem.add_runtime_dependency 'mongoid', '>= 6.0', '< 8.a'
23-
gem.add_runtime_dependency 'activeadmin', '>= 1.3.0'
24-
gem.add_runtime_dependency 'jquery-rails'
25-
gem.add_runtime_dependency 'sass-rails', ['>= 3.1.4']
23+
gem.add_runtime_dependency 'activeadmin', '>= 1.3.0', '<= 2.6.0'
2624
gem.add_runtime_dependency 'kaminari-mongoid'
2725
gem.add_runtime_dependency 'jquery-rails'
2826
gem.add_runtime_dependency 'sass-rails', ['>= 3.1.4']
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//= link active_admin.js

test_app/config/environments/development.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@
2727

2828
# Expands the lines which load the assets
2929
config.assets.debug = true
30+
31+
config.eager_load = false
3032
end

test_app/config/environments/test.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@
3333

3434
# Print deprecation notices to the stderr
3535
config.active_support.deprecation = :stderr
36+
37+
config.eager_load = false
3638
end

0 commit comments

Comments
 (0)