From 187f82bbd5a230d04d2fa3e7242958e85af70798 Mon Sep 17 00:00:00 2001
From: Igor Gonchar <igor.gonchar@gmail.com>
Date: Tue, 24 Oct 2023 10:05:34 +0300
Subject: [PATCH] update ruby/rails/activeadmin matrix

---
 .github/workflows/ci.yml            | 25 ++++++++++++++-----------
 Gemfile                             |  7 ++++---
 active_admin_datetimepicker.gemspec |  2 +-
 spec/spec_helper.rb                 |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 809eb11..7c18300 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,25 +11,28 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.5
-          - 2.6
+          - 3.0
+          - 3.1
+          - 3.2
         rails:
-          - '5.2.0'
-          - '6.0.0'
+          - '6.1.0'
+          - '7.0.0'
+          - '7.1.0'
         activeadmin:
-          - '2.0.0'
-          - '2.6.0'
+          - '2.14.0'
+          - '3.0.0'
+          - '3.1.0'
         exclude:
-          - rails: '5.2.0'
-            activeadmin: '2.6.0'
-          - rails: '6.0.0'
-            activeadmin: '2.0.0'
+          - rails: '7.1.0'
+            activeadmin: '2.14.0'
+          - rails: '7.1.0'
+            activeadmin: '3.0.0'
     env:
       RAILS: ${{ matrix.rails }}
       AA: ${{ matrix.activeadmin }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: Run tests
diff --git a/Gemfile b/Gemfile
index 0607cf3..fe74a8f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,15 +4,15 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  default_rails_version = '6.0.0'
-  default_activeadmin_version = '2.6.0'
+  default_rails_version = '7.0.0'
+  default_activeadmin_version = '3.0.0'
 
   gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}"
   gem 'activeadmin', "~> #{ENV['AA'] || default_activeadmin_version}"
 
   gem 'sprockets-rails', '3.0.4'
   gem 'rspec-rails'
-  gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
+  gem 'coveralls_reborn', require: false # Test coverage website. Go to https://coveralls.io
   gem 'sass-rails'
   gem 'sqlite3', '~> 1.4.0'
   gem 'launchy'
@@ -20,4 +20,5 @@ group :test do
   gem 'capybara'
   gem 'webdrivers'
   gem 'byebug'
+  gem 'webrick', require: false
 end
diff --git a/active_admin_datetimepicker.gemspec b/active_admin_datetimepicker.gemspec
index bf8311c..c364d5a 100644
--- a/active_admin_datetimepicker.gemspec
+++ b/active_admin_datetimepicker.gemspec
@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activeadmin", ">= 2.0", "< 3.a"
+  spec.add_dependency "activeadmin", ">= 2.14"
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c523fb4..5418252 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,7 +14,7 @@
 ENV['RAILS'] = Rails.version
 ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}", __FILE__)
 # Create the test app if it doesn't exists
-unless File.exists?(ENV['RAILS_ROOT'])
+unless File.exist?(ENV['RAILS_ROOT'])
   system 'rake setup'
 end