Skip to content

Commit d2acf54

Browse files
taglialatagliala
authored
Update version, changelog, and outdated deps (#656)
Rails 7.0 gemfile has been updated with Ruby 3.3.7 Additionally: - Fix obsolete RuboCop config, by removing `RSpec/StringAsInstanceDoubleConstant` cop
1 parent 386af3b commit d2acf54

File tree

8 files changed

+72
-59
lines changed

8 files changed

+72
-59
lines changed

‎.rubocop.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,6 @@ RSpec/SpecFilePathFormat:
559559
RSpec/SpecFilePathSuffix:
560560
Enabled: true
561561

562-
RSpec/StringAsInstanceDoubleConstant:
563-
Enabled: true
564-
565562
RSpec/StubbedMock:
566563
Enabled: false
567564

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## unreleased [☰](https://github.com/activeadmin/arbre/compare/v2.1.0...master)
3+
## 2.2.0 [☰](https://github.com/activeadmin/arbre/compare/v2.1.0...v2.2.0)
44

55
* Add some missing HTML5 elements [#655][] by [@tagliala][]
66

‎Gemfile.lock

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
arbre (2.1.0)
4+
arbre (2.2.0)
55
activesupport (>= 7.0)
66

77
GEM
@@ -99,7 +99,7 @@ GEM
9999
activesupport (>= 3.0.0)
100100
railties (>= 3.0.0)
101101
thor (>= 0.14.6)
102-
concurrent-ruby (1.3.4)
102+
concurrent-ruby (1.3.5)
103103
connection_pool (2.5.0)
104104
crass (1.0.6)
105105
date (3.4.1)
@@ -109,14 +109,15 @@ GEM
109109
erubi (1.13.1)
110110
globalid (1.2.1)
111111
activesupport (>= 6.1)
112-
i18n (1.14.6)
112+
i18n (1.14.7)
113113
concurrent-ruby (~> 1.0)
114114
io-console (0.8.0)
115-
irb (1.14.3)
115+
irb (1.15.1)
116+
pp (>= 0.6.0)
116117
rdoc (>= 4.0.0)
117118
reline (>= 0.4.2)
118119
json (2.9.1)
119-
language_server-protocol (3.17.0.3)
120+
language_server-protocol (3.17.0.4)
120121
logger (1.6.5)
121122
loofah (2.24.0)
122123
crass (~> 1.0.2)
@@ -141,30 +142,33 @@ GEM
141142
timeout
142143
net-smtp (0.5.0)
143144
nio4r (2.7.4)
144-
nokogiri (1.18.1)
145+
nokogiri (1.18.2)
145146
mini_portile2 (~> 2.8.2)
146147
racc (~> 1.4)
147-
nokogiri (1.18.1-aarch64-linux-gnu)
148+
nokogiri (1.18.2-aarch64-linux-gnu)
148149
racc (~> 1.4)
149-
nokogiri (1.18.1-arm64-darwin)
150+
nokogiri (1.18.2-arm64-darwin)
150151
racc (~> 1.4)
151-
nokogiri (1.18.1-x86_64-darwin)
152+
nokogiri (1.18.2-x86_64-darwin)
152153
racc (~> 1.4)
153-
nokogiri (1.18.1-x86_64-linux-gnu)
154+
nokogiri (1.18.2-x86_64-linux-gnu)
154155
racc (~> 1.4)
155156
parallel (1.26.3)
156-
parser (3.3.6.0)
157+
parser (3.3.7.0)
157158
ast (~> 2.4.1)
158159
racc
160+
pp (0.6.2)
161+
prettyprint
162+
prettyprint (0.2.0)
159163
pry (0.15.2)
160164
coderay (~> 1.1)
161165
method_source (~> 1.0)
162-
psych (5.2.2)
166+
psych (5.2.3)
163167
date
164168
stringio
165169
public_suffix (6.0.1)
166170
racc (1.8.1)
167-
rack (3.1.8)
171+
rack (3.1.9)
168172
rack-session (2.1.0)
169173
base64 (>= 0.1.0)
170174
rack (>= 3.0.0)
@@ -203,7 +207,7 @@ GEM
203207
zeitwerk (~> 2.6)
204208
rainbow (3.1.1)
205209
rake (13.2.1)
206-
rdoc (6.10.0)
210+
rdoc (6.11.0)
207211
psych (>= 4.0.0)
208212
regexp_parser (2.10.0)
209213
reline (0.6.0)
@@ -230,17 +234,17 @@ GEM
230234
rspec-mocks (~> 3.13)
231235
rspec-support (~> 3.13)
232236
rspec-support (3.13.2)
233-
rubocop (1.70.0)
237+
rubocop (1.71.1)
234238
json (~> 2.3)
235239
language_server-protocol (>= 3.17.0)
236240
parallel (~> 1.10)
237241
parser (>= 3.3.0.2)
238242
rainbow (>= 2.2.2, < 4.0)
239243
regexp_parser (>= 2.9.3, < 3.0)
240-
rubocop-ast (>= 1.36.2, < 2.0)
244+
rubocop-ast (>= 1.38.0, < 2.0)
241245
ruby-progressbar (~> 1.7)
242246
unicode-display_width (>= 2.4.0, < 4.0)
243-
rubocop-ast (1.37.0)
247+
rubocop-ast (1.38.0)
244248
parser (>= 3.3.1.0)
245249
rubocop-capybara (2.21.0)
246250
rubocop (~> 1.41)
@@ -249,7 +253,7 @@ GEM
249253
rubocop-performance (1.23.1)
250254
rubocop (>= 1.48.1, < 2.0)
251255
rubocop-ast (>= 1.31.1, < 2.0)
252-
rubocop-rspec (3.3.0)
256+
rubocop-rspec (3.4.0)
253257
rubocop (~> 1.61)
254258
ruby-progressbar (1.13.0)
255259
securerandom (0.4.1)
@@ -267,7 +271,7 @@ GEM
267271
timeout (0.4.3)
268272
tzinfo (2.0.6)
269273
concurrent-ruby (~> 1.0)
270-
unicode-display_width (3.1.3)
274+
unicode-display_width (3.1.4)
271275
unicode-emoji (~> 4.0, >= 4.0.4)
272276
unicode-emoji (4.0.4)
273277
uri (1.0.2)
@@ -305,4 +309,4 @@ DEPENDENCIES
305309
simplecov-cobertura
306310

307311
BUNDLED WITH
308-
2.6.2
312+
2.6.3

‎gemfiles/rails_70/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ group :rails do
1616
gem 'combustion'
1717
gem 'capybara'
1818

19+
gem "concurrent-ruby", "1.3.4" # Ref: rails/rails#54260
20+
1921
# FIXME: relax this dependency when Ruby 3.1 support will be dropped
2022
gem "zeitwerk", "~> 2.6.18"
2123
end

‎gemfiles/rails_70/Gemfile.lock

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../..
33
specs:
4-
arbre (2.1.0)
4+
arbre (2.2.0)
55
activesupport (>= 7.0)
66

77
GEM
@@ -98,7 +98,7 @@ GEM
9898
erubi (1.13.1)
9999
globalid (1.2.1)
100100
activesupport (>= 6.1)
101-
i18n (1.14.6)
101+
i18n (1.14.7)
102102
concurrent-ruby (~> 1.0)
103103
loofah (2.24.0)
104104
crass (~> 1.0.2)
@@ -122,17 +122,18 @@ GEM
122122
net-protocol (0.2.2)
123123
timeout
124124
net-smtp (0.5.0)
125+
net-protocol
125126
nio4r (2.7.4)
126-
nokogiri (1.18.1)
127+
nokogiri (1.18.2)
127128
mini_portile2 (~> 2.8.2)
128129
racc (~> 1.4)
129-
nokogiri (1.18.1-aarch64-linux-gnu)
130+
nokogiri (1.18.2-aarch64-linux-gnu)
130131
racc (~> 1.4)
131-
nokogiri (1.18.1-arm64-darwin)
132+
nokogiri (1.18.2-arm64-darwin)
132133
racc (~> 1.4)
133-
nokogiri (1.18.1-x86_64-darwin)
134+
nokogiri (1.18.2-x86_64-darwin)
134135
racc (~> 1.4)
135-
nokogiri (1.18.1-x86_64-linux-gnu)
136+
nokogiri (1.18.2-x86_64-linux-gnu)
136137
racc (~> 1.4)
137138
pry (0.15.2)
138139
coderay (~> 1.1)
@@ -226,6 +227,7 @@ DEPENDENCIES
226227
arbre!
227228
capybara
228229
combustion
230+
concurrent-ruby (= 1.3.4)
229231
pry
230232
rails (~> 7.0.0)
231233
rake
@@ -236,4 +238,4 @@ DEPENDENCIES
236238
zeitwerk (~> 2.6.18)
237239

238240
BUNDLED WITH
239-
2.6.2
241+
2.6.3

‎gemfiles/rails_71/Gemfile.lock

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../..
33
specs:
4-
arbre (2.1.0)
4+
arbre (2.2.0)
55
activesupport (>= 7.0)
66

77
GEM
@@ -104,7 +104,7 @@ GEM
104104
activesupport (>= 3.0.0)
105105
railties (>= 3.0.0)
106106
thor (>= 0.14.6)
107-
concurrent-ruby (1.3.4)
107+
concurrent-ruby (1.3.5)
108108
connection_pool (2.5.0)
109109
crass (1.0.6)
110110
date (3.4.1)
@@ -114,10 +114,11 @@ GEM
114114
erubi (1.13.1)
115115
globalid (1.2.1)
116116
activesupport (>= 6.1)
117-
i18n (1.14.6)
117+
i18n (1.14.7)
118118
concurrent-ruby (~> 1.0)
119119
io-console (0.8.0)
120-
irb (1.14.3)
120+
irb (1.15.1)
121+
pp (>= 0.6.0)
121122
rdoc (>= 4.0.0)
122123
reline (>= 0.4.2)
123124
logger (1.6.5)
@@ -145,26 +146,29 @@ GEM
145146
timeout
146147
net-smtp (0.5.0)
147148
nio4r (2.7.4)
148-
nokogiri (1.18.1)
149+
nokogiri (1.18.2)
149150
mini_portile2 (~> 2.8.2)
150151
racc (~> 1.4)
151-
nokogiri (1.18.1-aarch64-linux-gnu)
152+
nokogiri (1.18.2-aarch64-linux-gnu)
152153
racc (~> 1.4)
153-
nokogiri (1.18.1-arm64-darwin)
154+
nokogiri (1.18.2-arm64-darwin)
154155
racc (~> 1.4)
155-
nokogiri (1.18.1-x86_64-darwin)
156+
nokogiri (1.18.2-x86_64-darwin)
156157
racc (~> 1.4)
157-
nokogiri (1.18.1-x86_64-linux-gnu)
158+
nokogiri (1.18.2-x86_64-linux-gnu)
158159
racc (~> 1.4)
160+
pp (0.6.2)
161+
prettyprint
162+
prettyprint (0.2.0)
159163
pry (0.15.2)
160164
coderay (~> 1.1)
161165
method_source (~> 1.0)
162-
psych (5.2.2)
166+
psych (5.2.3)
163167
date
164168
stringio
165169
public_suffix (6.0.1)
166170
racc (1.8.1)
167-
rack (3.1.8)
171+
rack (3.1.9)
168172
rack-session (2.1.0)
169173
base64 (>= 0.1.0)
170174
rack (>= 3.0.0)
@@ -202,7 +206,7 @@ GEM
202206
thor (~> 1.0, >= 1.2.2)
203207
zeitwerk (~> 2.6)
204208
rake (13.2.1)
205-
rdoc (6.10.0)
209+
rdoc (6.11.0)
206210
psych (>= 4.0.0)
207211
regexp_parser (2.10.0)
208212
reline (0.6.0)
@@ -273,4 +277,4 @@ DEPENDENCIES
273277
zeitwerk (~> 2.6.18)
274278

275279
BUNDLED WITH
276-
2.6.2
280+
2.6.3

‎gemfiles/rails_72/Gemfile.lock

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../..
33
specs:
4-
arbre (2.1.0)
4+
arbre (2.2.0)
55
activesupport (>= 7.0)
66

77
GEM
@@ -98,7 +98,7 @@ GEM
9898
activesupport (>= 3.0.0)
9999
railties (>= 3.0.0)
100100
thor (>= 0.14.6)
101-
concurrent-ruby (1.3.4)
101+
concurrent-ruby (1.3.5)
102102
connection_pool (2.5.0)
103103
crass (1.0.6)
104104
date (3.4.1)
@@ -108,10 +108,11 @@ GEM
108108
erubi (1.13.1)
109109
globalid (1.2.1)
110110
activesupport (>= 6.1)
111-
i18n (1.14.6)
111+
i18n (1.14.7)
112112
concurrent-ruby (~> 1.0)
113113
io-console (0.8.0)
114-
irb (1.14.3)
114+
irb (1.15.1)
115+
pp (>= 0.6.0)
115116
rdoc (>= 4.0.0)
116117
reline (>= 0.4.2)
117118
logger (1.6.5)
@@ -138,26 +139,29 @@ GEM
138139
timeout
139140
net-smtp (0.5.0)
140141
nio4r (2.7.4)
141-
nokogiri (1.18.1)
142+
nokogiri (1.18.2)
142143
mini_portile2 (~> 2.8.2)
143144
racc (~> 1.4)
144-
nokogiri (1.18.1-aarch64-linux-gnu)
145+
nokogiri (1.18.2-aarch64-linux-gnu)
145146
racc (~> 1.4)
146-
nokogiri (1.18.1-arm64-darwin)
147+
nokogiri (1.18.2-arm64-darwin)
147148
racc (~> 1.4)
148-
nokogiri (1.18.1-x86_64-darwin)
149+
nokogiri (1.18.2-x86_64-darwin)
149150
racc (~> 1.4)
150-
nokogiri (1.18.1-x86_64-linux-gnu)
151+
nokogiri (1.18.2-x86_64-linux-gnu)
151152
racc (~> 1.4)
153+
pp (0.6.2)
154+
prettyprint
155+
prettyprint (0.2.0)
152156
pry (0.15.2)
153157
coderay (~> 1.1)
154158
method_source (~> 1.0)
155-
psych (5.2.2)
159+
psych (5.2.3)
156160
date
157161
stringio
158162
public_suffix (6.0.1)
159163
racc (1.8.1)
160-
rack (3.1.8)
164+
rack (3.1.9)
161165
rack-session (2.1.0)
162166
base64 (>= 0.1.0)
163167
rack (>= 3.0.0)
@@ -195,7 +199,7 @@ GEM
195199
thor (~> 1.0, >= 1.2.2)
196200
zeitwerk (~> 2.6)
197201
rake (13.2.1)
198-
rdoc (6.10.0)
202+
rdoc (6.11.0)
199203
psych (>= 4.0.0)
200204
regexp_parser (2.10.0)
201205
reline (0.6.0)
@@ -267,4 +271,4 @@ DEPENDENCIES
267271
zeitwerk (~> 2.6.18)
268272

269273
BUNDLED WITH
270-
2.6.2
274+
2.6.3

‎lib/arbre/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# frozen_string_literal: true
22
module Arbre
3-
VERSION = "2.1.0"
3+
VERSION = "2.2.0"
44
end

0 commit comments

Comments
 (0)