diff --git a/.travis.yml b/.travis.yml index 2342226..ae8e7c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: ruby cache: bundler sudo: false gemfile: - - Gemfile-rails.3.2.x - Gemfile-rails.4.0.x - Gemfile-rails.4.1.x - Gemfile-rails.4.2.x @@ -10,9 +9,6 @@ gemfile: - Gemfile-rails.5.1.x - Gemfile rvm: - - 1.9.3 - - 2.0.0 - - 2.1.10 - 2.2.10 - 2.3.7 - 2.4.3 @@ -20,14 +16,6 @@ rvm: - jruby matrix: exclude: - - rvm: 2.2.10 - gemfile: Gemfile-rails.3.2.x - - rvm: 2.3.7 - gemfile: Gemfile-rails.3.2.x - - rvm: 2.4.3 - gemfile: Gemfile-rails.3.2.x - - rvm: 2.5.1 - gemfile: Gemfile-rails.3.2.x - rvm: 2.4.3 gemfile: Gemfile-rails.4.0.x - rvm: 2.5.1 @@ -36,32 +24,10 @@ matrix: gemfile: Gemfile-rails.4.1.x - rvm: 2.5.1 gemfile: Gemfile-rails.4.1.x - - rvm: 1.9.3 - gemfile: Gemfile-rails.4.2.x - - rvm: 2.0.0 - gemfile: Gemfile-rails.4.2.x - - rvm: 1.9.3 - gemfile: Gemfile - - rvm: 2.0.0 - gemfile: Gemfile - - rvm: 2.1.10 - gemfile: Gemfile - rvm: jruby gemfile: Gemfile - - rvm: 1.9.3 - gemfile: Gemfile-rails.5.0.x - - rvm: 2.0.0 - gemfile: Gemfile-rails.5.0.x - - rvm: 2.1.10 - gemfile: Gemfile-rails.5.0.x - rvm: jruby gemfile: Gemfile-rails.5.0.x - - rvm: 1.9.3 - gemfile: Gemfile-rails.5.1.x - - rvm: 2.0.0 - gemfile: Gemfile-rails.5.1.x - - rvm: 2.1.10 - gemfile: Gemfile-rails.5.1.x - rvm: jruby gemfile: Gemfile-rails.5.1.x allow_failures: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b34457..1015b50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## unreleased * Update I18n dependency to require >= 0.7, allowing to install more recent versions ([@nazarhussain](https://github.com/nazarhussain)) +* Drop support to Rails 3.2 and Ruby 1.9.3/2.0.x/2.1.x ## v0.2.4 - 2017-08-03 diff --git a/Gemfile-rails.3.2.x b/Gemfile-rails.3.2.x deleted file mode 100644 index f013f62..0000000 --- a/Gemfile-rails.3.2.x +++ /dev/null @@ -1,14 +0,0 @@ -source 'https://rubygems.org' - -gemspec - -gem 'activerecord', '~> 3.2.0' -gem 'activesupport', '~> 3.2.0' - -platform :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2.0' -end - -platform :ruby do - gem 'sqlite3', '~> 1.3.8' -end diff --git a/i18n_alchemy.gemspec b/i18n_alchemy.gemspec index 08cb4dd..f9f82d6 100644 --- a/i18n_alchemy.gemspec +++ b/i18n_alchemy.gemspec @@ -18,11 +18,11 @@ Gem::Specification.new do |s| s.test_files = Dir["test/**/*"] s.require_paths = ["lib"] - s.add_dependency "activesupport", ">= 3.2.0", "< 5.3.0" + s.add_dependency "activesupport", ">= 4.0.0", "< 5.3.0" s.add_dependency "i18n", ">= 0.7" - s.add_development_dependency "actionpack", ">= 3.2.0", "< 5.3.0" - s.add_development_dependency "activerecord", ">= 3.2.0", "< 5.3.0" + s.add_development_dependency "actionpack", ">= 4.0.0", "< 5.3.0" + s.add_development_dependency "activerecord", ">= 4.0.0", "< 5.3.0" s.add_development_dependency "minitest", ">= 4.3.2" s.add_development_dependency "rake", "~> 10.1" end diff --git a/test/test_helper.rb b/test/test_helper.rb index e13d0b9..2bf3be8 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -9,7 +9,7 @@ Minitest.autorun MiniTestCase = Minitest::Test rescue LoadError - # Rails 4.0/3.2 + # Rails 4.0 require 'minitest/unit' MiniTest::Unit.autorun MiniTestCase = MiniTest::Unit::TestCase