Skip to content

Commit 6e441d1

Browse files
authored
Merge pull request #30 from blocknotes/feat/support-aa-3.x
feat: change ActiveAdmin dependency version range
2 parents c1ad881 + 8832357 commit 6e441d1

7 files changed

Lines changed: 36 additions & 10 deletions

activeadmin_blaze_theme.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
2424
spec.files = Dir["{app,lib}/**/*", 'LICENSE.txt', 'README.md', 'index.js', 'package.json']
2525
spec.require_paths = ['lib']
2626

27-
spec.add_runtime_dependency 'activeadmin', '~> 2.0'
27+
spec.add_runtime_dependency 'activeadmin', '>= 2.0', '< 4'
2828

2929
spec.add_development_dependency 'appraisal', '~> 2.4'
3030
end

gemfiles/rails52_activeadmin20.gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
activeadmin_blaze_theme (1.0.0)
5-
activeadmin (~> 2.0)
5+
activeadmin (>= 2.0, < 4)
66

77
GEM
88
remote: https://rubygems.org/
@@ -145,11 +145,11 @@ GEM
145145
matrix (0.4.2)
146146
method_source (1.0.0)
147147
mini_mime (1.1.2)
148+
mini_portile2 (2.8.4)
148149
minitest (5.15.0)
149150
nio4r (2.5.8)
150-
nokogiri (1.13.3-x86_64-darwin)
151-
racc (~> 1.4)
152-
nokogiri (1.13.3-x86_64-linux)
151+
nokogiri (1.13.3)
152+
mini_portile2 (~> 2.8.0)
153153
racc (~> 1.4)
154154
parallel (1.22.1)
155155
parser (3.1.1.0)
@@ -281,6 +281,7 @@ GEM
281281
nokogiri (~> 1.8)
282282

283283
PLATFORMS
284+
arm64-darwin-22
284285
x86_64-darwin-21
285286
x86_64-linux
286287

gemfiles/rails60_activeadmin.gemfile.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
activeadmin_blaze_theme (1.0.0)
5-
activeadmin (~> 2.0)
5+
activeadmin (>= 2.0, < 4)
66

77
GEM
88
remote: https://rubygems.org/
@@ -151,8 +151,12 @@ GEM
151151
matrix (0.4.2)
152152
method_source (1.0.0)
153153
mini_mime (1.1.2)
154+
mini_portile2 (2.8.4)
154155
minitest (5.15.0)
155156
nio4r (2.5.8)
157+
nokogiri (1.13.3)
158+
mini_portile2 (~> 2.8.0)
159+
racc (~> 1.4)
156160
nokogiri (1.13.3-x86_64-darwin)
157161
racc (~> 1.4)
158162
nokogiri (1.13.3-x86_64-linux)
@@ -283,6 +287,7 @@ GEM
283287
zeitwerk (2.5.4)
284288

285289
PLATFORMS
290+
arm64-darwin-22
286291
x86_64-darwin-21
287292
x86_64-linux
288293

gemfiles/rails60_activeadmin22.gemfile.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
activeadmin_blaze_theme (1.0.0)
5-
activeadmin (~> 2.0)
5+
activeadmin (>= 2.0, < 4)
66

77
GEM
88
remote: https://rubygems.org/
@@ -159,8 +159,12 @@ GEM
159159
matrix (0.4.2)
160160
method_source (1.0.0)
161161
mini_mime (1.1.2)
162+
mini_portile2 (2.8.4)
162163
minitest (5.15.0)
163164
nio4r (2.5.8)
165+
nokogiri (1.13.3)
166+
mini_portile2 (~> 2.8.0)
167+
racc (~> 1.4)
164168
nokogiri (1.13.3-x86_64-darwin)
165169
racc (~> 1.4)
166170
nokogiri (1.13.3-x86_64-linux)
@@ -302,6 +306,7 @@ GEM
302306
zeitwerk (2.5.4)
303307

304308
PLATFORMS
309+
arm64-darwin-22
305310
x86_64-darwin-21
306311
x86_64-linux
307312

gemfiles/rails61_activeadmin.gemfile.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
activeadmin_blaze_theme (1.0.0)
5-
activeadmin (~> 2.0)
5+
activeadmin (>= 2.0, < 4)
66

77
GEM
88
remote: https://rubygems.org/
@@ -154,8 +154,12 @@ GEM
154154
matrix (0.4.2)
155155
method_source (1.0.0)
156156
mini_mime (1.1.2)
157+
mini_portile2 (2.8.4)
157158
minitest (5.15.0)
158159
nio4r (2.5.8)
160+
nokogiri (1.13.3)
161+
mini_portile2 (~> 2.8.0)
162+
racc (~> 1.4)
159163
nokogiri (1.13.3-x86_64-darwin)
160164
racc (~> 1.4)
161165
nokogiri (1.13.3-x86_64-linux)
@@ -280,6 +284,7 @@ GEM
280284
zeitwerk (2.5.4)
281285

282286
PLATFORMS
287+
arm64-darwin-22
283288
x86_64-darwin-21
284289
x86_64-linux
285290

gemfiles/rails61_activeadmin29.gemfile.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
activeadmin_blaze_theme (1.0.0)
5-
activeadmin (~> 2.0)
5+
activeadmin (>= 2.0, < 4)
66

77
GEM
88
remote: https://rubygems.org/
@@ -154,8 +154,12 @@ GEM
154154
matrix (0.4.2)
155155
method_source (1.0.0)
156156
mini_mime (1.1.2)
157+
mini_portile2 (2.8.4)
157158
minitest (5.15.0)
158159
nio4r (2.5.8)
160+
nokogiri (1.13.3)
161+
mini_portile2 (~> 2.8.0)
162+
racc (~> 1.4)
159163
nokogiri (1.13.3-x86_64-darwin)
160164
racc (~> 1.4)
161165
nokogiri (1.13.3-x86_64-linux)
@@ -280,6 +284,7 @@ GEM
280284
zeitwerk (2.5.4)
281285

282286
PLATFORMS
287+
arm64-darwin-22
283288
x86_64-darwin-21
284289
x86_64-linux
285290

gemfiles/rails70_activeadmin.gemfile.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
activeadmin_blaze_theme (1.0.0)
5-
activeadmin (~> 2.0)
5+
activeadmin (>= 2.0, < 4)
66

77
GEM
88
remote: https://rubygems.org/
@@ -162,6 +162,7 @@ GEM
162162
matrix (0.4.2)
163163
method_source (1.0.0)
164164
mini_mime (1.1.2)
165+
mini_portile2 (2.8.4)
165166
minitest (5.15.0)
166167
net-imap (0.2.3)
167168
digest
@@ -179,6 +180,9 @@ GEM
179180
net-protocol
180181
timeout
181182
nio4r (2.5.8)
183+
nokogiri (1.13.3)
184+
mini_portile2 (~> 2.8.0)
185+
racc (~> 1.4)
182186
nokogiri (1.13.3-x86_64-darwin)
183187
racc (~> 1.4)
184188
nokogiri (1.13.3-x86_64-linux)
@@ -305,6 +309,7 @@ GEM
305309
zeitwerk (2.5.4)
306310

307311
PLATFORMS
312+
arm64-darwin-22
308313
x86_64-darwin-21
309314
x86_64-linux
310315

0 commit comments

Comments
 (0)