Test against activeadmin 2.1.0

bolshakov · Jul 14, 2019 · c998e60 · c998e60
1 parent 9c5b463
commit c998e60
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,22 @@
 ---
 language: ruby
 rvm:
-- 2.5.3
-- 2.6.1
-before_script:
+- 2.5.5
+- 2.6.3
+before_install:
+- rvm use @global
+- gem uninstall bundler -x || true
+- gem install bundler --force --version=1.17.3
+- bundler --version
 - "./bin/setup"
 script:
 - bundle exec rake spec
 - bundle exec rubocop --fail-level C
 gemfile:
-- gemfiles/rails_5.2.2_activeadmin___github___activeadmin____ref___d95a9a853___reform_2.2.4_reform_rails_0.1.7_bootsnap_1.3.1.gemfile
-- gemfiles/rails_5.2.2_activeadmin___github___activeadmin____ref___d95a9a853___reform_2.3.0.rc1_reform_rails_0.2.0.rc2_bootsnap_1.3.1.gemfile
-- gemfiles/rails_4.2.11_activeadmin_1.2.1_reform_2.2.4_reform_rails_0.1.7.gemfile
+- gemfiles/rails_5.2.3_activeadmin_2.1.0_reform_2.3.0.rc1_reform_rails_0.2.0.rc2_bootsnap_1.3.1.gemfile
+- gemfiles/rails_5.2.3_activeadmin_2.0.0_reform_2.2.4_reform_rails_0.1.7_bootsnap_1.3.1.gemfile
+- gemfiles/rails_5.2.3_activeadmin_2.1.0_reform_2.2.4_reform_rails_0.1.7_bootsnap_1.3.1.gemfile
+- gemfiles/rails_4.2.11.1_activeadmin_1.4.3_reform_2.2.4_reform_rails_0.1.7.gemfile
 addons:
   code_climate:
     repo_token: c326cca5984d0e32d2c6b5d9b985756ee9312f63fc6a9480fc9cfa55c454d68a
diff --git a/Appraisals b/Appraisals
@@ -1,11 +1,12 @@
 require 'yaml'
 
-ruby_versions = %w(2.5.3 2.6.1)
+ruby_versions = %w(2.5.5 2.6.3)
 
 [
-  { rails: '4.2.11', activeadmin: '1.2.1', reform: '2.2.4', 'reform-rails': '0.1.7' },
-  { rails: '5.2.2', activeadmin: { github: 'activeadmin', ref: 'd95a9a853' }, reform: '2.2.4', 'reform-rails': '0.1.7', bootsnap: '1.3.1' },
-  { rails: '5.2.2', activeadmin: { github: 'activeadmin', ref: 'd95a9a853' }, reform: '2.3.0.rc1', 'reform-rails': '0.2.0.rc2', bootsnap: '1.3.1' },
+  { rails: '4.2.11.1', activeadmin: '1.4.3', reform: '2.2.4', 'reform-rails': '0.1.7' },
+  { rails: '5.2.3', activeadmin: '2.0.0', reform: '2.2.4', 'reform-rails': '0.1.7', bootsnap: '1.3.1' },
+  { rails: '5.2.3', activeadmin: '2.1.0', reform: '2.2.4', 'reform-rails': '0.1.7', bootsnap: '1.3.1' },
+  { rails: '5.2.3', activeadmin: '2.1.0', reform: '2.3.0.rc1', 'reform-rails': '0.2.0.rc2', bootsnap: '1.3.1' },
 ].each do |deps|
   appraise deps.map { |name, requirement| "#{name}-#{requirement}" }.join('_') do
     deps.each { |name, requirement| gem name, requirement }
@@ -16,7 +17,11 @@ gemfiles = Dir.glob('gemfiles/*.gemfile')
 travis = ::YAML.dump(
   'language' => 'ruby',
   'rvm' => ruby_versions,
-  'before_script' => [
+  'before_install' => [
+    'rvm use @global',
+    'gem uninstall bundler -x || true',
+    'gem install bundler --force --version=1.17.3',
+    'bundler --version',
     './bin/setup',
    ],
   'script'  => [

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.1.0 
+
+* Test against ActiveAdmin 2.1
+* Test against ruby 2.5.5 and 2.6.3
+* Loosen ActiveAdmin and Rails requirements.
+
 # 1.0.0
 
 * Test against ruby 2.5.3 and 2.6.1

diff --git a/activeadmin-reform.gemspec b/activeadmin-reform.gemspec
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'activeadmin-reform'
-  spec.version       = '1.0.0'
+  spec.version       = '1.1.0'
   spec.authors       = ['Artyom Bolshakov']
   spec.email         = ['either.free@gmail.com']
 
@@ -18,22 +18,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', ['>= 4.0.0', '< 5.3']
-  spec.add_dependency 'activeadmin', ['>= 1.2.1', '<= 2.0.0.alpha']
+  spec.add_dependency 'rails', ['>= 4.0.0', '< 6.0']
+  spec.add_dependency 'activeadmin', ['>= 1.4.3', '< 3.0']
   spec.add_dependency 'disposable', '>= 0.2.0'
   spec.add_dependency 'reform', '<= 2.3.0.rc1'
   spec.add_dependency 'reform-rails', '<= 0.2.0.rc2'
+
   spec.add_development_dependency 'appraisal', '2.2.0'
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler', '~> 1.17.3'
   spec.add_development_dependency 'capybara', '2.17.0'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.8'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'launchy', '~> 2.4.3'
   spec.add_development_dependency 'poltergeist'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'spbtv_code_style', '~> 1.4.1'
   spec.add_development_dependency 'sqlite3', '~> 1.3.11'
-  spec.add_development_dependency 'test-unit', '~> 3.0' # Rails 3.2 support
 end
diff --git a/...1_reform_2.2.4_reform_rails_0.1.7.gemfile → ...3_reform_2.2.4_reform_rails_0.1.7.gemfile b/...1_reform_2.2.4_reform_rails_0.1.7.gemfile → ...3_reform_2.2.4_reform_rails_0.1.7.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.11"
-gem "activeadmin", "1.2.1"
+gem "rails", "4.2.11.1"
+gem "activeadmin", "1.4.3"
 gem "reform", "2.2.4"
 gem "reform-rails", "0.1.7"
 

diff --git a/...reform_rails_0.1.7_bootsnap_1.3.1.gemfile → ...reform_rails_0.1.7_bootsnap_1.3.1.gemfile b/...reform_rails_0.1.7_bootsnap_1.3.1.gemfile → ...reform_rails_0.1.7_bootsnap_1.3.1.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.2"
-gem "activeadmin", github: "activeadmin", ref: "d95a9a853"
+gem "rails", "5.2.3"
+gem "activeadmin", "2.0.0"
 gem "reform", "2.2.4"
 gem "reform-rails", "0.1.7"
 gem "bootsnap", "1.3.1"

diff --git a/...iles/rails_5.2.3_activeadmin_2.1.0_reform_2.2.4_reform_rails_0.1.7_bootsnap_1.3.1.gemfile b/...iles/rails_5.2.3_activeadmin_2.1.0_reform_2.2.4_reform_rails_0.1.7_bootsnap_1.3.1.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.2.3"
+gem "activeadmin", "2.1.0"
+gem "reform", "2.2.4"
+gem "reform-rails", "0.1.7"
+gem "bootsnap", "1.3.1"
+
+gemspec path: "../"
diff --git a/...rm_rails_0.2.0.rc2_bootsnap_1.3.1.gemfile → ...rm_rails_0.2.0.rc2_bootsnap_1.3.1.gemfile b/...rm_rails_0.2.0.rc2_bootsnap_1.3.1.gemfile → ...rm_rails_0.2.0.rc2_bootsnap_1.3.1.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.2"
-gem "activeadmin", github: "activeadmin", ref: "d95a9a853"
+gem "rails", "5.2.3"
+gem "activeadmin", "2.1.0"
 gem "reform", "2.3.0.rc1"
 gem "reform-rails", "0.2.0.rc2"
 gem "bootsnap", "1.3.1"