Skip to content

Commit 7aee5a8

Browse files
authored
Add ActiveSupport 7.1 as default setup (#537)
* Update main Gemfile to Rails 7.1 * Update other Gemfiles - Move 7.0 Gemfile to the gemfiles folder * Add Rails 7.1 to the CI * Add changelog entry * Use new cache format for Rails 7.1 - Update changelog
1 parent 5f9cc4e commit 7aee5a8

File tree

8 files changed

+416
-70
lines changed

8 files changed

+416
-70
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ updates:
1414
schedule:
1515
interval: monthly
1616
versioning-strategy: lockfile-only
17+
- package-ecosystem: bundler
18+
directory: /gemfiles/rails_70
19+
schedule:
20+
interval: monthly
21+
versioning-strategy: lockfile-only

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@ jobs:
2020
deps:
2121
- rails_61
2222
- rails_70
23+
- rails_71
2324
steps:
2425
- uses: actions/checkout@v4
2526
- name: Configure bundler (default)
2627
run: |
2728
echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
28-
if: matrix.deps == 'rails_70'
29+
if: matrix.deps == 'rails_71'
2930
- name: Configure bundler (alternative)
3031
run: |
3132
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}/Gemfile" >> "$GITHUB_ENV"
32-
if: matrix.deps != 'rails_70'
33+
if: matrix.deps != 'rails_71'
3334
- uses: ruby/setup-ruby@v1
3435
with:
3536
ruby-version: ${{ matrix.ruby }}

CHANGELOG.md

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

33
## Master (unreleased)
44

5+
* Allow Active Support 7.1. [#537][] by [@tomascco][]
6+
57
## 1.6.0 [](https://github.com/activeadmin/arbre/compare/v1.5.0...v1.6.0)
68

79
* Drop support for Ruby 2.6. [#345][] by [@alejandroperea][]
@@ -120,6 +122,7 @@ Initial release and extraction from Active Admin
120122
[#345]: https://github.com/activeadmin/arbre/pull/345
121123
[#451]: https://github.com/activeadmin/arbre/pull/451
122124
[#456]: https://github.com/activeadmin/arbre/pull/456
125+
[#537]: https://github.com/activeadmin/arbre/pull/537
123126

124127
[@aramvisser]: https://github.com/aramvisser
125128
[@LTe]: https://github.com/LTe
@@ -141,3 +144,4 @@ Initial release and extraction from Active Admin
141144
[@mynnx]: https://github.com/mynnx
142145
[@Ikariusrb]: https://github.com/Ikariusrb
143146
[@ngan]: https://github.com/ngan
147+
[@tomascco]: https://github.com/tomascco

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ group :rubocop do
1818
end
1919

2020
group :rails do
21-
gem 'rails', '~> 7.0.2'
21+
gem 'rails', '~> 7.1.0'
2222
gem 'rspec-rails'
2323
gem 'combustion'
2424
gem 'capybara'

Gemfile.lock

Lines changed: 101 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -8,75 +8,85 @@ PATH
88
GEM
99
remote: http://rubygems.org/
1010
specs:
11-
actioncable (7.0.8)
12-
actionpack (= 7.0.8)
13-
activesupport (= 7.0.8)
11+
actioncable (7.1.0)
12+
actionpack (= 7.1.0)
13+
activesupport (= 7.1.0)
1414
nio4r (~> 2.0)
1515
websocket-driver (>= 0.6.1)
16-
actionmailbox (7.0.8)
17-
actionpack (= 7.0.8)
18-
activejob (= 7.0.8)
19-
activerecord (= 7.0.8)
20-
activestorage (= 7.0.8)
21-
activesupport (= 7.0.8)
16+
zeitwerk (~> 2.6)
17+
actionmailbox (7.1.0)
18+
actionpack (= 7.1.0)
19+
activejob (= 7.1.0)
20+
activerecord (= 7.1.0)
21+
activestorage (= 7.1.0)
22+
activesupport (= 7.1.0)
2223
mail (>= 2.7.1)
2324
net-imap
2425
net-pop
2526
net-smtp
26-
actionmailer (7.0.8)
27-
actionpack (= 7.0.8)
28-
actionview (= 7.0.8)
29-
activejob (= 7.0.8)
30-
activesupport (= 7.0.8)
27+
actionmailer (7.1.0)
28+
actionpack (= 7.1.0)
29+
actionview (= 7.1.0)
30+
activejob (= 7.1.0)
31+
activesupport (= 7.1.0)
3132
mail (~> 2.5, >= 2.5.4)
3233
net-imap
3334
net-pop
3435
net-smtp
35-
rails-dom-testing (~> 2.0)
36-
actionpack (7.0.8)
37-
actionview (= 7.0.8)
38-
activesupport (= 7.0.8)
39-
rack (~> 2.0, >= 2.2.4)
36+
rails-dom-testing (~> 2.2)
37+
actionpack (7.1.0)
38+
actionview (= 7.1.0)
39+
activesupport (= 7.1.0)
40+
nokogiri (>= 1.8.5)
41+
rack (>= 2.2.4)
42+
rack-session (>= 1.0.1)
4043
rack-test (>= 0.6.3)
41-
rails-dom-testing (~> 2.0)
42-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
43-
actiontext (7.0.8)
44-
actionpack (= 7.0.8)
45-
activerecord (= 7.0.8)
46-
activestorage (= 7.0.8)
47-
activesupport (= 7.0.8)
44+
rails-dom-testing (~> 2.2)
45+
rails-html-sanitizer (~> 1.6)
46+
actiontext (7.1.0)
47+
actionpack (= 7.1.0)
48+
activerecord (= 7.1.0)
49+
activestorage (= 7.1.0)
50+
activesupport (= 7.1.0)
4851
globalid (>= 0.6.0)
4952
nokogiri (>= 1.8.5)
50-
actionview (7.0.8)
51-
activesupport (= 7.0.8)
53+
actionview (7.1.0)
54+
activesupport (= 7.1.0)
5255
builder (~> 3.1)
53-
erubi (~> 1.4)
54-
rails-dom-testing (~> 2.0)
55-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
56-
activejob (7.0.8)
57-
activesupport (= 7.0.8)
56+
erubi (~> 1.11)
57+
rails-dom-testing (~> 2.2)
58+
rails-html-sanitizer (~> 1.6)
59+
activejob (7.1.0)
60+
activesupport (= 7.1.0)
5861
globalid (>= 0.3.6)
59-
activemodel (7.0.8)
60-
activesupport (= 7.0.8)
61-
activerecord (7.0.8)
62-
activemodel (= 7.0.8)
63-
activesupport (= 7.0.8)
64-
activestorage (7.0.8)
65-
actionpack (= 7.0.8)
66-
activejob (= 7.0.8)
67-
activerecord (= 7.0.8)
68-
activesupport (= 7.0.8)
62+
activemodel (7.1.0)
63+
activesupport (= 7.1.0)
64+
activerecord (7.1.0)
65+
activemodel (= 7.1.0)
66+
activesupport (= 7.1.0)
67+
timeout (>= 0.4.0)
68+
activestorage (7.1.0)
69+
actionpack (= 7.1.0)
70+
activejob (= 7.1.0)
71+
activerecord (= 7.1.0)
72+
activesupport (= 7.1.0)
6973
marcel (~> 1.0)
70-
mini_mime (>= 1.1.0)
71-
activesupport (7.0.8)
74+
activesupport (7.1.0)
75+
base64
76+
bigdecimal
7277
concurrent-ruby (~> 1.0, >= 1.0.2)
78+
connection_pool (>= 2.2.5)
79+
drb
7380
i18n (>= 1.6, < 2)
7481
minitest (>= 5.1)
82+
mutex_m
7583
tzinfo (~> 2.0)
7684
addressable (2.8.5)
7785
public_suffix (>= 2.0.2, < 6.0)
7886
ast (2.4.2)
7987
base64 (0.1.1)
88+
bigdecimal (3.1.4)
89+
bigdecimal (3.1.4-java)
8090
builder (3.2.4)
8191
capybara (3.39.2)
8292
addressable
@@ -93,17 +103,26 @@ GEM
93103
railties (>= 3.0.0)
94104
thor (>= 0.14.6)
95105
concurrent-ruby (1.2.2)
106+
connection_pool (2.4.1)
96107
crass (1.0.6)
97108
date (3.3.3)
98109
date (3.3.3-java)
99110
diff-lcs (1.5.0)
100111
docile (1.4.0)
112+
drb (2.1.1)
113+
ruby2_keywords
101114
erubi (1.12.0)
102115
ffi (1.16.3-java)
103116
globalid (1.2.1)
104117
activesupport (>= 6.1)
105118
i18n (1.14.1)
106119
concurrent-ruby (~> 1.0)
120+
io-console (0.6.0)
121+
io-console (0.6.0-java)
122+
irb (1.8.1)
123+
rdoc
124+
reline (>= 0.3.8)
125+
jar-dependencies (0.4.1)
107126
json (2.6.3)
108127
json (2.6.3-java)
109128
language_server-protocol (3.17.0.3)
@@ -121,6 +140,7 @@ GEM
121140
mini_mime (1.1.5)
122141
mini_portile2 (2.8.4)
123142
minitest (5.20.0)
143+
mutex_m (0.1.2)
124144
net-imap (0.4.0)
125145
date
126146
net-protocol
@@ -148,43 +168,57 @@ GEM
148168
coderay (~> 1.1)
149169
method_source (~> 1.0)
150170
spoon (~> 0.0)
171+
psych (5.1.0)
172+
stringio
173+
psych (5.1.0-java)
174+
jar-dependencies (>= 0.1.7)
151175
public_suffix (5.0.3)
152176
racc (1.7.1)
153177
racc (1.7.1-java)
154178
rack (2.2.8)
179+
rack-session (1.0.1)
180+
rack (< 3)
155181
rack-test (2.1.0)
156182
rack (>= 1.3)
157-
rails (7.0.8)
158-
actioncable (= 7.0.8)
159-
actionmailbox (= 7.0.8)
160-
actionmailer (= 7.0.8)
161-
actionpack (= 7.0.8)
162-
actiontext (= 7.0.8)
163-
actionview (= 7.0.8)
164-
activejob (= 7.0.8)
165-
activemodel (= 7.0.8)
166-
activerecord (= 7.0.8)
167-
activestorage (= 7.0.8)
168-
activesupport (= 7.0.8)
183+
rackup (1.0.0)
184+
rack (< 3)
185+
webrick
186+
rails (7.1.0)
187+
actioncable (= 7.1.0)
188+
actionmailbox (= 7.1.0)
189+
actionmailer (= 7.1.0)
190+
actionpack (= 7.1.0)
191+
actiontext (= 7.1.0)
192+
actionview (= 7.1.0)
193+
activejob (= 7.1.0)
194+
activemodel (= 7.1.0)
195+
activerecord (= 7.1.0)
196+
activestorage (= 7.1.0)
197+
activesupport (= 7.1.0)
169198
bundler (>= 1.15.0)
170-
railties (= 7.0.8)
199+
railties (= 7.1.0)
171200
rails-dom-testing (2.2.0)
172201
activesupport (>= 5.0.0)
173202
minitest
174203
nokogiri (>= 1.6)
175204
rails-html-sanitizer (1.6.0)
176205
loofah (~> 2.21)
177206
nokogiri (~> 1.14)
178-
railties (7.0.8)
179-
actionpack (= 7.0.8)
180-
activesupport (= 7.0.8)
181-
method_source
207+
railties (7.1.0)
208+
actionpack (= 7.1.0)
209+
activesupport (= 7.1.0)
210+
irb
211+
rackup (>= 1.0.0)
182212
rake (>= 12.2)
183-
thor (~> 1.0)
184-
zeitwerk (~> 2.5)
213+
thor (~> 1.0, >= 1.2.2)
214+
zeitwerk (~> 2.6)
185215
rainbow (3.1.1)
186216
rake (13.0.6)
217+
rdoc (6.5.0)
218+
psych (>= 4.0.0)
187219
regexp_parser (2.8.1)
220+
reline (0.3.9)
221+
io-console (~> 0.5)
188222
rexml (3.2.6)
189223
rspec (3.12.0)
190224
rspec-core (~> 3.12.0)
@@ -236,11 +270,13 @@ GEM
236270
simplecov_json_formatter (0.1.4)
237271
spoon (0.0.6)
238272
ffi
273+
stringio (3.0.8)
239274
thor (1.2.2)
240275
timeout (0.4.0)
241276
tzinfo (2.0.6)
242277
concurrent-ruby (~> 1.0)
243278
unicode-display_width (2.5.0)
279+
webrick (1.8.1)
244280
websocket-driver (0.7.6)
245281
websocket-extensions (>= 0.1.0)
246282
websocket-driver (0.7.6-java)
@@ -259,7 +295,7 @@ DEPENDENCIES
259295
capybara
260296
combustion
261297
pry
262-
rails (~> 7.0.2)
298+
rails (~> 7.1.0)
263299
rake
264300
rspec
265301
rspec-rails

gemfiles/rails_70/Gemfile

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# frozen_string_literal: true
2+
source 'http://rubygems.org'
3+
4+
gem 'rake'
5+
6+
group :test do
7+
gem 'rspec'
8+
gem 'simplecov', require: false
9+
gem 'simplecov-cobertura'
10+
gem 'pry'
11+
end
12+
13+
group :rubocop do
14+
gem 'rubocop'
15+
gem 'rubocop-packaging'
16+
end
17+
18+
group :rails do
19+
gem 'rails', '~> 7.0.8'
20+
gem 'rspec-rails'
21+
gem 'combustion'
22+
gem 'capybara'
23+
end
24+
25+
gemspec path: "../.."

0 commit comments

Comments
 (0)