Skip to content

Commit d0efd09

Browse files
authored
Support for rails 6 (#183)
* Update active_admin_import.gemspec * add 6.0.2.2 on 2.7.1 test * ignore ruby low version for rails 6 * fix test * fix bundler * fix ignore
1 parent 07cee9c commit d0efd09

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
script: bundle exec rspec spec
22
env:
33
matrix:
4-
- RAILS=5.1.6.2
5-
- RAILS=5.2.2.1
4+
- RAILS=5.2.4.3
5+
- RAILS=6.0.3.2
66
rvm:
77
- 2.4.5
88
- 2.5.5
99
- 2.6.5
1010
- 2.7.0
11+
- 2.7.1
12+
jobs:
13+
exclude:
14+
- rvm: 2.4.5
15+
env: RAILS=6.0.3.2

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ gemspec
66

77

88
group :test do
9-
default_rails_version = "~> 5.1"
9+
default_rails_version = "~> 5.2.4"
1010
rails_version = ENV['RAILS'] || default_rails_version
1111
gem 'rails', rails_version
1212
gem 'rspec-rails'
1313
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
14-
gem 'sqlite3',"~> 1.3.6"
14+
gem "sqlite3", "~> 1.4.0"
1515
gem 'launchy'
1616
gem 'database_cleaner'
1717
gem 'capybara'

active_admin_import.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
1616
gem.require_paths = ['lib']
1717
gem.version = ActiveAdminImport::VERSION
1818
gem.add_runtime_dependency 'activerecord-import', '>= 0.27'
19-
gem.add_runtime_dependency 'rchardet', '~> 1.6'
20-
gem.add_runtime_dependency 'rubyzip', '~> 1.2'
19+
gem.add_runtime_dependency 'rchardet', '>= 1.6'
20+
gem.add_runtime_dependency 'rubyzip', '>= 1.2'
2121
gem.add_dependency 'activeadmin', '>= 1.0.0.pre2'
2222
end

0 commit comments

Comments
 (0)