Merge pull request #30 from blocknotes/feat/support-aa-3.x

feat: change ActiveAdmin dependency version range
blocknotes · Oct 5, 2023 · 6e441d1 · 6e441d1
2 parents c1ad881 + 8832357
commit 6e441d1
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/activeadmin_blaze_theme.gemspec b/activeadmin_blaze_theme.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir["{app,lib}/**/*", 'LICENSE.txt', 'README.md', 'index.js', 'package.json']
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activeadmin', '~> 2.0'
+  spec.add_runtime_dependency 'activeadmin', '>= 2.0', '< 4'
 
   spec.add_development_dependency 'appraisal', '~> 2.4'
 end
diff --git a/gemfiles/rails52_activeadmin20.gemfile.lock b/gemfiles/rails52_activeadmin20.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activeadmin_blaze_theme (1.0.0)
-      activeadmin (~> 2.0)
+      activeadmin (>= 2.0, < 4)
 
 GEM
   remote: https://rubygems.org/
@@ -145,11 +145,11 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.1.0)
@@ -281,6 +281,7 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 

diff --git a/gemfiles/rails60_activeadmin.gemfile.lock b/gemfiles/rails60_activeadmin.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activeadmin_blaze_theme (1.0.0)
-      activeadmin (~> 2.0)
+      activeadmin (>= 2.0, < 4)
 
 GEM
   remote: https://rubygems.org/
@@ -151,8 +151,12 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-linux)
@@ -283,6 +287,7 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 

diff --git a/gemfiles/rails60_activeadmin22.gemfile.lock b/gemfiles/rails60_activeadmin22.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activeadmin_blaze_theme (1.0.0)
-      activeadmin (~> 2.0)
+      activeadmin (>= 2.0, < 4)
 
 GEM
   remote: https://rubygems.org/
@@ -159,8 +159,12 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-linux)
@@ -302,6 +306,7 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 

diff --git a/gemfiles/rails61_activeadmin.gemfile.lock b/gemfiles/rails61_activeadmin.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activeadmin_blaze_theme (1.0.0)
-      activeadmin (~> 2.0)
+      activeadmin (>= 2.0, < 4)
 
 GEM
   remote: https://rubygems.org/
@@ -154,8 +154,12 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-linux)
@@ -280,6 +284,7 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 

diff --git a/gemfiles/rails61_activeadmin29.gemfile.lock b/gemfiles/rails61_activeadmin29.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activeadmin_blaze_theme (1.0.0)
-      activeadmin (~> 2.0)
+      activeadmin (>= 2.0, < 4)
 
 GEM
   remote: https://rubygems.org/
@@ -154,8 +154,12 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-linux)
@@ -280,6 +284,7 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 

diff --git a/gemfiles/rails70_activeadmin.gemfile.lock b/gemfiles/rails70_activeadmin.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     activeadmin_blaze_theme (1.0.0)
-      activeadmin (~> 2.0)
+      activeadmin (>= 2.0, < 4)
 
 GEM
   remote: https://rubygems.org/
@@ -162,6 +162,7 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     net-imap (0.2.3)
       digest
@@ -179,6 +180,9 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-linux)
@@ -305,6 +309,7 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux