Merge pull request #113 from activeadmin-plugins/Fivell-patch-2

Update active_admin_import.gemspec

Author: Fivell

Gemfile

@@ -16,9 +16,6 @@ group :test do
   gem 'capybara'
   gem 'selenium-webdriver'
   gem 'poltergeist'
-  if RUBY_VERSION >= '2.0'
-    gem 'mime-types',  '~> 3.0'
-  else
-    gem 'mime-types', '< 3.0.0'
-  end
+  gem 'json', '~> 1.8', platforms: :ruby_19 # Json 2.0 requires Ruby >= 2.0
+  gem 'mime-types', '< 3.0.0', platforms: [:ruby_19, :ruby_20]
 end

active_admin_import.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version = ActiveAdminImport::VERSION
 
 
-  gem.add_runtime_dependency 'activerecord-import', '~> 0.14.0'
+  gem.add_runtime_dependency 'activerecord-import', '>= 0.14'
   gem.add_runtime_dependency 'rchardet', '~> 1.6'
 
   gem.add_runtime_dependency 'rubyzip', '~> 1.2'