Skip to content

Commit 4961db5

Browse files
SponeSpone
authored
Merge branch 'main' into activesupport-configurable-deprecated
2 parents f00ca7b + b148c4b commit 4961db5

10 files changed

Lines changed: 88 additions & 68 deletions

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ruby ruby_version
1313
group :development, :test do
1414
gem "allocation_stats"
1515
gem "appraisal", "~> 2"
16-
gem "appraisal-run", "~> 1.0"
16+
gem "appraisal-run", "~> 1.1"
1717
gem "benchmark-ips", "~> 2"
1818
gem "better_html"
1919
gem "bundler", "~> 2"
@@ -27,7 +27,7 @@ group :development, :test do
2727
gem "method_source", "~> 1"
2828
gem "minitest", "~> 5"
2929
gem "propshaft", "~> 1"
30-
gem "puma", "~> 6"
30+
gem "puma", ">= 6"
3131
gem "rake", "~> 13"
3232
gem "rails-dom-testing", "~> 2.3.0"
3333
gem "redis"

‎Gemfile.lock‎

Lines changed: 67 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,81 @@ PATH
33
specs:
44
view_component (4.1.0)
55
activesupport (>= 7.1.0, < 8.2)
6+
actionview (>= 7.1.0, < 8.2)
67
concurrent-ruby (~> 1)
78

89
GEM
910
remote: https://rubygems.org/
1011
specs:
11-
actioncable (8.0.3)
12-
actionpack (= 8.0.3)
13-
activesupport (= 8.0.3)
12+
action_text-trix (2.1.15)
13+
railties
14+
actioncable (8.1.0)
15+
actionpack (= 8.1.0)
16+
activesupport (= 8.1.0)
1417
nio4r (~> 2.0)
1518
websocket-driver (>= 0.6.1)
1619
zeitwerk (~> 2.6)
17-
actionmailbox (8.0.3)
18-
actionpack (= 8.0.3)
19-
activejob (= 8.0.3)
20-
activerecord (= 8.0.3)
21-
activestorage (= 8.0.3)
22-
activesupport (= 8.0.3)
20+
actionmailbox (8.1.0)
21+
actionpack (= 8.1.0)
22+
activejob (= 8.1.0)
23+
activerecord (= 8.1.0)
24+
activestorage (= 8.1.0)
25+
activesupport (= 8.1.0)
2326
mail (>= 2.8.0)
24-
actionmailer (8.0.3)
25-
actionpack (= 8.0.3)
26-
actionview (= 8.0.3)
27-
activejob (= 8.0.3)
28-
activesupport (= 8.0.3)
27+
actionmailer (8.1.0)
28+
actionpack (= 8.1.0)
29+
actionview (= 8.1.0)
30+
activejob (= 8.1.0)
31+
activesupport (= 8.1.0)
2932
mail (>= 2.8.0)
3033
rails-dom-testing (~> 2.2)
31-
actionpack (8.0.3)
32-
actionview (= 8.0.3)
33-
activesupport (= 8.0.3)
34+
actionpack (8.1.0)
35+
actionview (= 8.1.0)
36+
activesupport (= 8.1.0)
3437
nokogiri (>= 1.8.5)
3538
rack (>= 2.2.4)
3639
rack-session (>= 1.0.1)
3740
rack-test (>= 0.6.3)
3841
rails-dom-testing (~> 2.2)
3942
rails-html-sanitizer (~> 1.6)
4043
useragent (~> 0.16)
41-
actiontext (8.0.3)
42-
actionpack (= 8.0.3)
43-
activerecord (= 8.0.3)
44-
activestorage (= 8.0.3)
45-
activesupport (= 8.0.3)
44+
actiontext (8.1.0)
45+
action_text-trix (~> 2.1.15)
46+
actionpack (= 8.1.0)
47+
activerecord (= 8.1.0)
48+
activestorage (= 8.1.0)
49+
activesupport (= 8.1.0)
4650
globalid (>= 0.6.0)
4751
nokogiri (>= 1.8.5)
48-
actionview (8.0.3)
49-
activesupport (= 8.0.3)
52+
actionview (8.1.0)
53+
activesupport (= 8.1.0)
5054
builder (~> 3.1)
5155
erubi (~> 1.11)
5256
rails-dom-testing (~> 2.2)
5357
rails-html-sanitizer (~> 1.6)
54-
activejob (8.0.3)
55-
activesupport (= 8.0.3)
58+
activejob (8.1.0)
59+
activesupport (= 8.1.0)
5660
globalid (>= 0.3.6)
57-
activemodel (8.0.3)
58-
activesupport (= 8.0.3)
59-
activerecord (8.0.3)
60-
activemodel (= 8.0.3)
61-
activesupport (= 8.0.3)
61+
activemodel (8.1.0)
62+
activesupport (= 8.1.0)
63+
activerecord (8.1.0)
64+
activemodel (= 8.1.0)
65+
activesupport (= 8.1.0)
6266
timeout (>= 0.4.0)
63-
activestorage (8.0.3)
64-
actionpack (= 8.0.3)
65-
activejob (= 8.0.3)
66-
activerecord (= 8.0.3)
67-
activesupport (= 8.0.3)
67+
activestorage (8.1.0)
68+
actionpack (= 8.1.0)
69+
activejob (= 8.1.0)
70+
activerecord (= 8.1.0)
71+
activesupport (= 8.1.0)
6872
marcel (~> 1.0)
69-
activesupport (8.0.3)
73+
activesupport (8.1.0)
7074
base64
71-
benchmark (>= 0.3)
7275
bigdecimal
7376
concurrent-ruby (~> 1.0, >= 1.3.1)
7477
connection_pool (>= 2.2.5)
7578
drb
7679
i18n (>= 1.6, < 2)
80+
json
7781
logger (>= 1.4.2)
7882
minitest (>= 5.1)
7983
securerandom (>= 0.3)
@@ -87,10 +91,9 @@ GEM
8791
bundler
8892
rake
8993
thor (>= 0.14.0)
90-
appraisal-run (1.0.0)
94+
appraisal-run (1.1.0)
9195
ast (2.4.3)
9296
base64 (0.3.0)
93-
benchmark (0.4.1)
9497
benchmark-ips (2.14.0)
9598
better_html (2.1.1)
9699
actionview (>= 6.0)
@@ -136,7 +139,7 @@ GEM
136139
concurrent-ruby (~> 1.1)
137140
webrick (~> 1.7)
138141
websocket-driver (~> 0.7)
139-
globalid (1.2.1)
142+
globalid (1.3.0)
140143
activesupport (>= 6.1)
141144
haml (6.3.0)
142145
temple (>= 0.8.2)
@@ -162,17 +165,18 @@ GEM
162165
m (1.6.2)
163166
method_source (>= 0.6.7)
164167
rake (>= 0.9.2.2)
165-
mail (2.8.1)
168+
mail (2.9.0)
169+
logger
166170
mini_mime (>= 0.1.1)
167171
net-imap
168172
net-pop
169173
net-smtp
170-
marcel (1.0.4)
174+
marcel (1.1.0)
171175
matrix (0.4.3)
172176
method_source (1.1.0)
173177
mini_mime (1.1.5)
174178
minitest (5.26.0)
175-
net-imap (0.5.9)
179+
net-imap (0.5.12)
176180
date
177181
net-protocol
178182
net-pop (0.1.2)
@@ -214,7 +218,7 @@ GEM
214218
date
215219
stringio
216220
public_suffix (6.0.2)
217-
puma (6.6.1)
221+
puma (7.1.0)
218222
nio4r (~> 2.0)
219223
racc (1.8.1)
220224
rack (3.2.3)
@@ -225,30 +229,30 @@ GEM
225229
rack (>= 1.3)
226230
rackup (2.2.1)
227231
rack (>= 3)
228-
rails (8.0.3)
229-
actioncable (= 8.0.3)
230-
actionmailbox (= 8.0.3)
231-
actionmailer (= 8.0.3)
232-
actionpack (= 8.0.3)
233-
actiontext (= 8.0.3)
234-
actionview (= 8.0.3)
235-
activejob (= 8.0.3)
236-
activemodel (= 8.0.3)
237-
activerecord (= 8.0.3)
238-
activestorage (= 8.0.3)
239-
activesupport (= 8.0.3)
232+
rails (8.1.0)
233+
actioncable (= 8.1.0)
234+
actionmailbox (= 8.1.0)
235+
actionmailer (= 8.1.0)
236+
actionpack (= 8.1.0)
237+
actiontext (= 8.1.0)
238+
actionview (= 8.1.0)
239+
activejob (= 8.1.0)
240+
activemodel (= 8.1.0)
241+
activerecord (= 8.1.0)
242+
activestorage (= 8.1.0)
243+
activesupport (= 8.1.0)
240244
bundler (>= 1.15.0)
241-
railties (= 8.0.3)
245+
railties (= 8.1.0)
242246
rails-dom-testing (2.3.0)
243247
activesupport (>= 5.0.0)
244248
minitest
245249
nokogiri (>= 1.6)
246250
rails-html-sanitizer (1.6.2)
247251
loofah (~> 2.21)
248252
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
249-
railties (8.0.3)
250-
actionpack (= 8.0.3)
251-
activesupport (= 8.0.3)
253+
railties (8.1.0)
254+
actionpack (= 8.1.0)
255+
activesupport (= 8.1.0)
252256
irb (~> 1.13)
253257
rackup (>= 1.0.0)
254258
rake (>= 12.2)
@@ -405,7 +409,7 @@ PLATFORMS
405409
DEPENDENCIES
406410
allocation_stats
407411
appraisal (~> 2)
408-
appraisal-run (~> 1.0)
412+
appraisal-run (~> 1.1)
409413
benchmark-ips (~> 2)
410414
better_html
411415
bundler (~> 2)
@@ -419,7 +423,7 @@ DEPENDENCIES
419423
method_source (~> 1)
420424
minitest (~> 5)
421425
propshaft (~> 1)
422-
puma (~> 6)
426+
puma (~> 7)
423427
rails (~> 8)
424428
rails-dom-testing (~> 2.3.0)
425429
rake (~> 13)

‎docs/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ nav_order: 6
1414

1515
*Simon Fish*
1616

17+
* Make `ViewComponent::VERSION` accessible to other gems by default.
18+
19+
*Hans Lemuet*
20+
1721
* Added Reinvented Hospitality to the list of companies using ViewComponent.
1822

1923
*Torgil Zechel*
@@ -28,6 +32,10 @@ nav_order: 6
2832

2933
*Tom Lord*
3034

35+
* Declare `actionview` as a `view_component` gem dependency.
36+
37+
*Michal Cichra*
38+
3139
## 4.0.2
3240

3341
* Share the view context in tests to prevent out-of-order rendering issues for certain advanced use-cases, eg. testing instances of Rails' `FormBuilder`.

‎gemfiles/rails_7.1.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ PATH
22
remote: ..
33
specs:
44
view_component (4.1.0)
5+
actionview (>= 7.1.0, < 8.2)
56
activesupport (>= 7.1.0, < 8.2)
67
concurrent-ruby (~> 1)
78

‎gemfiles/rails_7.2.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ PATH
22
remote: ..
33
specs:
44
view_component (4.1.0)
5+
actionview (>= 7.1.0, < 8.2)
56
activesupport (>= 7.1.0, < 8.2)
67
concurrent-ruby (~> 1)
78

‎gemfiles/rails_8.0.gemfile.lock‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
PATH
22
remote: ..
33
specs:
4-
view_component (4.0.2)
4+
view_component (4.1.0)
5+
actionview (>= 7.1.0, < 8.2)
56
activesupport (>= 7.1.0, < 8.2)
67
concurrent-ruby (~> 1)
78

‎gemfiles/rails_8.1.gemfile.lock‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
PATH
22
remote: ..
33
specs:
4-
view_component (4.0.2)
4+
view_component (4.1.0)
5+
actionview (>= 7.1.0, < 8.2)
56
activesupport (>= 7.1.0, < 8.2)
67
concurrent-ruby (~> 1)
78

‎gemfiles/rails_main.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ PATH
110110
remote: ..
111111
specs:
112112
view_component (4.1.0)
113+
actionview (>= 7.1.0, < 8.2)
113114
activesupport (>= 7.1.0, < 8.2)
114115
concurrent-ruby (~> 1)
115116

‎lib/view_component.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
require "action_view"
44
require "active_support/dependencies/autoload"
5+
require "view_component/version"
56

67
module ViewComponent
78
extend ActiveSupport::Autoload

‎view_component.gemspec‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Gem::Specification.new do |spec|
3232

3333
spec.required_ruby_version = ">= 3.2.0"
3434

35-
spec.add_runtime_dependency "activesupport", [">= 7.1.0", "< 8.2"]
35+
supported_rails_version = [">= 7.1.0", "< 8.2"]
36+
spec.add_runtime_dependency "activesupport", supported_rails_version
37+
spec.add_runtime_dependency "actionview", supported_rails_version
3638
spec.add_runtime_dependency "concurrent-ruby", "~> 1"
3739
end

0 commit comments

Comments
 (0)