diff --git a/.travis.yml b/.travis.yml index 0489aec..f850708 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,14 @@ script: bundle exec rspec spec env: matrix: - - RAILS=5.2.4.6 - - RAILS=6.0.3.7 + - RAILS=5.2.6 + - RAILS=6.0.4 + - RAILS=6.1.4 rvm: - - 2.4.10 - - 2.5.9 - 2.6.7 - - 2.7.3 - - 3.0.1 + - 2.7.4 + - 3.0.2 jobs: exclude: - - rvm: 2.4.10 - env: RAILS=6.0.3.7 - rvm: 3.0.1 - env: RAILS=5.2.4.6 + env: RAILS=5.2.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index e423ff6..458a8a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ # Changelog +## [5.0.0] - 2021-11-16 +- Ruby 3 compatibility added #190 | @clinejj +- Support for a non UTF-8 file when zip uploading #185| @naokirin +- Rails 6 supported #183 | @pnghai +- Drop ruby 2.4 support #192 | @Fivell + + ## [4.2.0] - 2020-02-05 - generic exception for import added #175 | @linqueta diff --git a/active_admin_import.gemspec b/active_admin_import.gemspec index 6176e3e..252c83d 100644 --- a/active_admin_import.gemspec +++ b/active_admin_import.gemspec @@ -18,5 +18,5 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'activerecord-import', '>= 0.27' gem.add_runtime_dependency 'rchardet', '>= 1.6' gem.add_runtime_dependency 'rubyzip', '>= 1.2' - gem.add_dependency 'activeadmin', '>= 1.0.0.pre2' + gem.add_dependency 'activeadmin', '>= 1.0.0' end diff --git a/lib/active_admin_import/version.rb b/lib/active_admin_import/version.rb index d6c6cec..994e654 100644 --- a/lib/active_admin_import/version.rb +++ b/lib/active_admin_import/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module ActiveAdminImport - VERSION = '4.2.0' + VERSION = '5.0.0' end