Skip to content

Commit 95b2c99

Browse files
taglialajavierjulio
tagliala
authored and
javierjulio
committed
Allow Rails 7.0
Also: - Tests against Rails 7.0 by default - Updates all the Gemfile.lock
1 parent 219d088 commit 95b2c99

File tree

11 files changed

+694
-218
lines changed

11 files changed

+694
-218
lines changed

‎.github/workflows/ci.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ jobs:
5353
- { name: ruby-3.0, value: 3.0.1 }
5454
- { name: jruby-9.2, value: jruby-9.2.17.0 }
5555

56-
rails: [rails_52, rails_60, rails_61]
56+
rails: [rails_52, rails_60, rails_61, rails_70]
5757

5858
exclude:
59+
- ruby: { name: ruby-2.5, value: 2.5.9 }
60+
rails: rails_70
61+
- ruby: { name: ruby-2.6, value: 2.6.7 }
62+
rails: rails_70
5963
- ruby: { name: ruby-3.0, value: 3.0.1 }
6064
rails: rails_52
65+
- ruby: { name: jruby-9.2, value: jruby-9.2.17.0 }
66+
rails: rails_70
6167

6268
env:
6369
COVERAGE: true
@@ -68,12 +74,12 @@ jobs:
6874
- name: Configure bundler (default)
6975
run: |
7076
echo "BUNDLE_GEMFILE=Gemfile" >> $GITHUB_ENV
71-
if: matrix.rails == 'rails_61'
77+
if: matrix.rails == 'rails_70'
7278

7379
- name: Configure bundler (alternative)
7480
run: |
7581
echo "BUNDLE_GEMFILE=test/${{ matrix.rails }}/Gemfile" >> $GITHUB_ENV
76-
if: matrix.rails != 'rails_61'
82+
if: matrix.rails != 'rails_70'
7783

7884
- uses: ruby/setup-ruby@v1
7985
with:

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Master (unreleased)
44

5+
* Allow using Rails 7.0.
6+
57
## Version 1.13.0
68

79
* Remove support for Ruby `< 2.5`.

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
gemspec path: '.'
44

55
group :development do
6-
gem 'rails', '~> 6.1.3.a'
6+
gem 'rails', '~> 7.0.0'
77

88
gem 'mocha'
99
gem 'minitest-rg'

‎Gemfile.lock

Lines changed: 112 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -2,195 +2,206 @@ PATH
22
remote: .
33
specs:
44
inherited_resources (1.13.0)
5-
actionpack (>= 5.2, < 6.2)
5+
actionpack (>= 5.2, < 7.1)
66
has_scope (~> 0.6)
7-
railties (>= 5.2, < 6.2)
7+
railties (>= 5.2, < 7.1)
88
responders (>= 2, < 4)
99

1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (6.1.3.2)
14-
actionpack (= 6.1.3.2)
15-
activesupport (= 6.1.3.2)
13+
actioncable (7.0.0)
14+
actionpack (= 7.0.0)
15+
activesupport (= 7.0.0)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailbox (6.1.3.2)
19-
actionpack (= 6.1.3.2)
20-
activejob (= 6.1.3.2)
21-
activerecord (= 6.1.3.2)
22-
activestorage (= 6.1.3.2)
23-
activesupport (= 6.1.3.2)
18+
actionmailbox (7.0.0)
19+
actionpack (= 7.0.0)
20+
activejob (= 7.0.0)
21+
activerecord (= 7.0.0)
22+
activestorage (= 7.0.0)
23+
activesupport (= 7.0.0)
2424
mail (>= 2.7.1)
25-
actionmailer (6.1.3.2)
26-
actionpack (= 6.1.3.2)
27-
actionview (= 6.1.3.2)
28-
activejob (= 6.1.3.2)
29-
activesupport (= 6.1.3.2)
25+
actionmailer (7.0.0)
26+
actionpack (= 7.0.0)
27+
actionview (= 7.0.0)
28+
activejob (= 7.0.0)
29+
activesupport (= 7.0.0)
3030
mail (~> 2.5, >= 2.5.4)
3131
rails-dom-testing (~> 2.0)
32-
actionpack (6.1.3.2)
33-
actionview (= 6.1.3.2)
34-
activesupport (= 6.1.3.2)
35-
rack (~> 2.0, >= 2.0.9)
32+
actionpack (7.0.0)
33+
actionview (= 7.0.0)
34+
activesupport (= 7.0.0)
35+
rack (~> 2.0, >= 2.2.0)
3636
rack-test (>= 0.6.3)
3737
rails-dom-testing (~> 2.0)
3838
rails-html-sanitizer (~> 1.0, >= 1.2.0)
39-
actiontext (6.1.3.2)
40-
actionpack (= 6.1.3.2)
41-
activerecord (= 6.1.3.2)
42-
activestorage (= 6.1.3.2)
43-
activesupport (= 6.1.3.2)
39+
actiontext (7.0.0)
40+
actionpack (= 7.0.0)
41+
activerecord (= 7.0.0)
42+
activestorage (= 7.0.0)
43+
activesupport (= 7.0.0)
44+
globalid (>= 0.6.0)
4445
nokogiri (>= 1.8.5)
45-
actionview (6.1.3.2)
46-
activesupport (= 6.1.3.2)
46+
actionview (7.0.0)
47+
activesupport (= 7.0.0)
4748
builder (~> 3.1)
4849
erubi (~> 1.4)
4950
rails-dom-testing (~> 2.0)
5051
rails-html-sanitizer (~> 1.1, >= 1.2.0)
51-
activejob (6.1.3.2)
52-
activesupport (= 6.1.3.2)
52+
activejob (7.0.0)
53+
activesupport (= 7.0.0)
5354
globalid (>= 0.3.6)
54-
activemodel (6.1.3.2)
55-
activesupport (= 6.1.3.2)
56-
activerecord (6.1.3.2)
57-
activemodel (= 6.1.3.2)
58-
activesupport (= 6.1.3.2)
59-
activestorage (6.1.3.2)
60-
actionpack (= 6.1.3.2)
61-
activejob (= 6.1.3.2)
62-
activerecord (= 6.1.3.2)
63-
activesupport (= 6.1.3.2)
64-
marcel (~> 1.0.0)
65-
mini_mime (~> 1.0.2)
66-
activesupport (6.1.3.2)
55+
activemodel (7.0.0)
56+
activesupport (= 7.0.0)
57+
activerecord (7.0.0)
58+
activemodel (= 7.0.0)
59+
activesupport (= 7.0.0)
60+
activestorage (7.0.0)
61+
actionpack (= 7.0.0)
62+
activejob (= 7.0.0)
63+
activerecord (= 7.0.0)
64+
activesupport (= 7.0.0)
65+
marcel (~> 1.0)
66+
mini_mime (>= 1.1.0)
67+
activesupport (7.0.0)
6768
concurrent-ruby (~> 1.0, >= 1.0.2)
6869
i18n (>= 1.6, < 2)
6970
minitest (>= 5.1)
7071
tzinfo (~> 2.0)
71-
zeitwerk (~> 2.3)
7272
addressable (2.8.0)
7373
public_suffix (>= 2.0.2, < 5.0)
7474
ast (2.4.2)
7575
builder (3.2.4)
7676
chandler (0.9.0)
7777
netrc
7878
octokit (>= 2.2.0)
79-
concurrent-ruby (1.1.8)
79+
concurrent-ruby (1.1.9)
8080
crass (1.0.6)
8181
erubi (1.10.0)
82-
faraday (1.0.1)
82+
faraday (1.8.0)
83+
faraday-em_http (~> 1.0)
84+
faraday-em_synchrony (~> 1.0)
85+
faraday-excon (~> 1.1)
86+
faraday-httpclient (~> 1.0.1)
87+
faraday-net_http (~> 1.0)
88+
faraday-net_http_persistent (~> 1.1)
89+
faraday-patron (~> 1.0)
90+
faraday-rack (~> 1.0)
8391
multipart-post (>= 1.2, < 3)
84-
globalid (0.4.2)
85-
activesupport (>= 4.2.0)
92+
ruby2_keywords (>= 0.0.4)
93+
faraday-em_http (1.0.0)
94+
faraday-em_synchrony (1.0.0)
95+
faraday-excon (1.1.0)
96+
faraday-httpclient (1.0.1)
97+
faraday-net_http (1.0.1)
98+
faraday-net_http_persistent (1.2.0)
99+
faraday-patron (1.0.0)
100+
faraday-rack (1.0.0)
101+
globalid (1.0.0)
102+
activesupport (>= 5.0)
86103
has_scope (0.8.0)
87104
actionpack (>= 5.2)
88105
activesupport (>= 5.2)
89-
i18n (1.8.10)
106+
i18n (1.8.11)
90107
concurrent-ruby (~> 1.0)
91-
loofah (2.9.1)
108+
loofah (2.13.0)
92109
crass (~> 1.0.2)
93110
nokogiri (>= 1.5.9)
94111
mail (2.7.1)
95112
mini_mime (>= 0.1.1)
96-
marcel (1.0.1)
113+
marcel (1.0.2)
97114
method_source (1.0.0)
98-
mini_mime (1.0.3)
99-
mini_portile2 (2.5.1)
100-
minitest (5.14.4)
115+
mini_mime (1.1.2)
116+
mini_portile2 (2.6.1)
117+
minitest (5.15.0)
101118
minitest-rg (5.2.0)
102119
minitest (~> 5.0)
103-
mocha (1.12.0)
120+
mocha (1.13.0)
104121
multipart-post (2.1.1)
105122
netrc (0.11.0)
106-
nio4r (2.5.7)
107-
nio4r (2.5.7-java)
108-
nokogiri (1.11.3)
109-
mini_portile2 (~> 2.5.0)
123+
nio4r (2.5.8)
124+
nio4r (2.5.8-java)
125+
nokogiri (1.12.5)
126+
mini_portile2 (~> 2.6.1)
110127
racc (~> 1.4)
111-
nokogiri (1.11.3-java)
128+
nokogiri (1.12.5-java)
112129
racc (~> 1.4)
113-
octokit (4.18.0)
130+
octokit (4.21.0)
114131
faraday (>= 0.9)
115132
sawyer (~> 0.8.0, >= 0.5.3)
116-
parallel (1.20.1)
117-
parser (3.0.1.1)
133+
parallel (1.21.0)
134+
parser (3.0.3.2)
118135
ast (~> 2.4.1)
119136
public_suffix (4.0.6)
120-
racc (1.5.2)
121-
racc (1.5.2-java)
137+
racc (1.6.0)
138+
racc (1.6.0-java)
122139
rack (2.2.3)
123140
rack-test (1.1.0)
124141
rack (>= 1.0, < 3)
125-
rails (6.1.3.2)
126-
actioncable (= 6.1.3.2)
127-
actionmailbox (= 6.1.3.2)
128-
actionmailer (= 6.1.3.2)
129-
actionpack (= 6.1.3.2)
130-
actiontext (= 6.1.3.2)
131-
actionview (= 6.1.3.2)
132-
activejob (= 6.1.3.2)
133-
activemodel (= 6.1.3.2)
134-
activerecord (= 6.1.3.2)
135-
activestorage (= 6.1.3.2)
136-
activesupport (= 6.1.3.2)
142+
rails (7.0.0)
143+
actioncable (= 7.0.0)
144+
actionmailbox (= 7.0.0)
145+
actionmailer (= 7.0.0)
146+
actionpack (= 7.0.0)
147+
actiontext (= 7.0.0)
148+
actionview (= 7.0.0)
149+
activejob (= 7.0.0)
150+
activemodel (= 7.0.0)
151+
activerecord (= 7.0.0)
152+
activestorage (= 7.0.0)
153+
activesupport (= 7.0.0)
137154
bundler (>= 1.15.0)
138-
railties (= 6.1.3.2)
139-
sprockets-rails (>= 2.0.0)
155+
railties (= 7.0.0)
140156
rails-controller-testing (1.0.5)
141157
actionpack (>= 5.0.1.rc1)
142158
actionview (>= 5.0.1.rc1)
143159
activesupport (>= 5.0.1.rc1)
144160
rails-dom-testing (2.0.3)
145161
activesupport (>= 4.2.0)
146162
nokogiri (>= 1.6)
147-
rails-html-sanitizer (1.3.0)
163+
rails-html-sanitizer (1.4.2)
148164
loofah (~> 2.3)
149-
railties (6.1.3.2)
150-
actionpack (= 6.1.3.2)
151-
activesupport (= 6.1.3.2)
165+
railties (7.0.0)
166+
actionpack (= 7.0.0)
167+
activesupport (= 7.0.0)
152168
method_source
153-
rake (>= 0.8.7)
169+
rake (>= 12.2)
154170
thor (~> 1.0)
171+
zeitwerk (~> 2.5)
155172
rainbow (3.0.0)
156-
rake (13.0.3)
157-
regexp_parser (2.1.1)
173+
rake (13.0.6)
174+
regexp_parser (2.2.0)
158175
responders (3.0.1)
159176
actionpack (>= 5.0)
160177
railties (>= 5.0)
161178
rexml (3.2.5)
162-
rubocop (1.14.0)
179+
rubocop (1.23.0)
163180
parallel (~> 1.10)
164181
parser (>= 3.0.0.0)
165182
rainbow (>= 2.2.2, < 4.0)
166183
regexp_parser (>= 1.8, < 3.0)
167184
rexml
168-
rubocop-ast (>= 1.5.0, < 2.0)
185+
rubocop-ast (>= 1.12.0, < 2.0)
169186
ruby-progressbar (~> 1.7)
170187
unicode-display_width (>= 1.4.0, < 3.0)
171-
rubocop-ast (1.5.0)
188+
rubocop-ast (1.15.0)
172189
parser (>= 3.0.1.1)
173190
ruby-progressbar (1.11.0)
191+
ruby2_keywords (0.0.5)
174192
sawyer (0.8.2)
175193
addressable (>= 2.3.5)
176194
faraday (> 0.8, < 2.0)
177-
sprockets (4.0.2)
178-
concurrent-ruby (~> 1.0)
179-
rack (> 1, < 3)
180-
sprockets-rails (3.2.2)
181-
actionpack (>= 4.0)
182-
activesupport (>= 4.0)
183-
sprockets (>= 3.0.0)
184195
thor (1.1.0)
185196
tzinfo (2.0.4)
186197
concurrent-ruby (~> 1.0)
187-
unicode-display_width (2.0.0)
188-
websocket-driver (0.7.3)
198+
unicode-display_width (2.1.0)
199+
websocket-driver (0.7.5)
189200
websocket-extensions (>= 0.1.0)
190-
websocket-driver (0.7.3-java)
201+
websocket-driver (0.7.5-java)
191202
websocket-extensions (>= 0.1.0)
192203
websocket-extensions (0.1.5)
193-
zeitwerk (2.4.2)
204+
zeitwerk (2.5.1)
194205

195206
PLATFORMS
196207
java
@@ -201,9 +212,9 @@ DEPENDENCIES
201212
inherited_resources!
202213
minitest-rg
203214
mocha
204-
rails (~> 6.1.3.a)
215+
rails (~> 7.0.0)
205216
rails-controller-testing
206217
rubocop
207218

208219
BUNDLED WITH
209-
2.2.17
220+
2.2.31

‎inherited_resources.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
2222
s.required_ruby_version = '>= 2.5'
2323

2424
s.add_dependency("responders", ">= 2", "< 4")
25-
s.add_dependency("actionpack", ">= 5.2", "< 6.2")
26-
s.add_dependency("railties", ">= 5.2", "< 6.2")
25+
s.add_dependency("actionpack", ">= 5.2", "< 7.1")
26+
s.add_dependency("railties", ">= 5.2", "< 7.1")
2727
s.add_dependency("has_scope", "~> 0.6")
2828
end

0 commit comments

Comments
 (0)