Skip to content

Commit f67085f

Browse files
authored
Merge pull request #26 from blocknotes/feat/support-aa-3.x
feat: change ActiveAdmin dependency version range
2 parents 0af9274 + 43eb9d9 commit f67085f

18 files changed

+215
-880
lines changed

.github/workflows/specs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['2.6', '2.7']
17-
gemfile: ['rails60_activeadmin22', 'rails60_activeadmin']
16+
ruby: ['2.7']
17+
gemfile: ['rails60_activeadmin']
1818

1919
env:
2020
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

.github/workflows/specs2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['2.6', '2.7', '3.0']
16+
ruby: ['2.7', '3.0']
1717
gemfile: ['rails61_activeadmin29', 'rails61_activeadmin']
1818

1919
env:

.github/workflows/specs3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ruby: ['2.7', '3.0']
16+
ruby: ['3.0', '3.1', '3.2']
1717
gemfile: ['rails70_activeadmin']
1818

1919
env:

Appraisals

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
# frozen_string_literal: true
22

3-
appraise 'rails52-activeadmin20' do
4-
gem 'activeadmin', '~> 2.0.0'
5-
gem 'rails', '~> 5.2.0'
6-
end
7-
8-
appraise 'rails60-activeadmin22' do
9-
gem 'activeadmin', '~> 2.2.0'
10-
gem 'rails', '~> 6.0.0'
11-
gem 'selenium-webdriver', require: false
12-
end
13-
143
appraise 'rails60-activeadmin' do
154
gem 'activeadmin'
165
gem 'rails', '~> 6.0.0'

activeadmin_dynamic_fields.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121
spec.files = Dir['{app,lib}/**/*', 'LICENSE.txt', 'Rakefile', 'README.md']
2222
spec.require_paths = ['lib']
2323

24-
spec.add_runtime_dependency 'activeadmin', '~> 2.0'
24+
spec.add_runtime_dependency 'activeadmin', '>= 2.0', '< 4'
2525

2626
spec.add_development_dependency 'appraisal', '~> 2.4'
2727
end

extra/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bin/appraisal
1212

1313
```sh
1414
# Running specs using a specific configuration:
15-
bin/appraisal rails60-activeadmin22 rspec
15+
bin/appraisal rails61-activeadmin29 rspec
1616
# Using latest activeadmin version:
1717
bin/appraisal rails60-activeadmin rspec
1818
# See gemfiles for more configurations

gemfiles/rails52_activeadmin20.gemfile

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)