Skip to content

Commit

Permalink
Merge pull request #26 from blocknotes/feat/support-aa-3.x
Browse files Browse the repository at this point in the history
feat: change ActiveAdmin dependency version range
  • Loading branch information
blocknotes committed Sep 10, 2023
2 parents 0af9274 + 43eb9d9 commit f67085f
Show file tree
Hide file tree
Showing 18 changed files with 215 additions and 880 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:

strategy:
matrix:
ruby: ['2.6', '2.7']
gemfile: ['rails60_activeadmin22', 'rails60_activeadmin']
ruby: ['2.7']
gemfile: ['rails60_activeadmin']

env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/specs2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
ruby: ['2.6', '2.7', '3.0']
ruby: ['2.7', '3.0']
gemfile: ['rails61_activeadmin29', 'rails61_activeadmin']

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/specs3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
ruby: ['2.7', '3.0']
ruby: ['3.0', '3.1', '3.2']
gemfile: ['rails70_activeadmin']

env:
Expand Down
11 changes: 0 additions & 11 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
# frozen_string_literal: true

appraise 'rails52-activeadmin20' do
gem 'activeadmin', '~> 2.0.0'
gem 'rails', '~> 5.2.0'
end

appraise 'rails60-activeadmin22' do
gem 'activeadmin', '~> 2.2.0'
gem 'rails', '~> 6.0.0'
gem 'selenium-webdriver', require: false
end

appraise 'rails60-activeadmin' do
gem 'activeadmin'
gem 'rails', '~> 6.0.0'
Expand Down
2 changes: 1 addition & 1 deletion activeadmin_dynamic_fields.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
spec.files = Dir['{app,lib}/**/*', 'LICENSE.txt', 'Rakefile', 'README.md']
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
2 changes: 1 addition & 1 deletion extra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bin/appraisal

```sh
# Running specs using a specific configuration:
bin/appraisal rails60-activeadmin22 rspec
bin/appraisal rails61-activeadmin29 rspec
# Using latest activeadmin version:
bin/appraisal rails60-activeadmin rspec
# See gemfiles for more configurations
Expand Down
26 changes: 0 additions & 26 deletions gemfiles/rails52_activeadmin20.gemfile

This file was deleted.

Loading

0 comments on commit f67085f

Please sign in to comment.