Skip to content

Commit

Permalink
Officially drop support to Ruby 1.8/REE and Rails < 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosantoniodasilva committed Jul 16, 2014
1 parent 0ebd3ac commit 94b1705
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 148 deletions.
23 changes: 0 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,20 @@
before_install: "sudo apt-get install ruby-tokyocabinet -y"

rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1
- ree
- rbx
- jruby

gemfile:
- Gemfile
- gemfiles/Gemfile.rails-2.3.x
- gemfiles/Gemfile.rails-3.0.x
- gemfiles/Gemfile.rails-3.1.x
- gemfiles/Gemfile.rails-3.2.x
- gemfiles/Gemfile.rails-4.0.x
- gemfiles/Gemfile.rails-4.1.x

matrix:
allow_failures:
- rvm: ree
- rvm: rbx
- rvm: jruby
exclude:
- gemfile: gemfiles/Gemfile.rails-2.3.x
rvm: 2.0.0
- gemfile: gemfiles/Gemfile.rails-2.3.x
rvm: 2.1
- gemfile: gemfiles/Gemfile.rails-2.3.x
rvm: rbx
- gemfile: gemfiles/Gemfile.rails-2.3.x
rvm: jruby
- gemfile: gemfiles/Gemfile.rails-4.0.x
rvm: 1.8.7
- gemfile: gemfiles/Gemfile.rails-4.0.x
rvm: ree
- gemfile: gemfiles/Gemfile.rails-4.1.x
rvm: 1.8.7
- gemfile: gemfiles/Gemfile.rails-4.1.x
rvm: ree
fast_finish: true
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# 0.7 (unreleased)

* Drop support to Ruby 1.8.7 / REE
* Drop support to Rails 2.3 / 3.0 / 3.1
11 changes: 0 additions & 11 deletions gemfiles/Gemfile.rails-2.3.x

This file was deleted.

30 changes: 0 additions & 30 deletions gemfiles/Gemfile.rails-2.3.x.lock

This file was deleted.

11 changes: 0 additions & 11 deletions gemfiles/Gemfile.rails-3.0.x

This file was deleted.

30 changes: 0 additions & 30 deletions gemfiles/Gemfile.rails-3.0.x.lock

This file was deleted.

10 changes: 0 additions & 10 deletions gemfiles/Gemfile.rails-3.1.x

This file was deleted.

30 changes: 0 additions & 30 deletions gemfiles/Gemfile.rails-3.1.x.lock

This file was deleted.

2 changes: 1 addition & 1 deletion lib/i18n/backend/interpolation_compiler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# Note that InterpolationCompiler does not yield meaningful results and consequently
# should not be used with Ruby 1.9 (YARV) but improves performance everywhere else
# (jRuby, Rubinius and 1.8.7).
# (jRuby, Rubinius).
module I18n
module Backend
module InterpolationCompiler
Expand Down
3 changes: 1 addition & 2 deletions test/api/override_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ def setup
@I18n.backend.store_translations('en', :foo => 'bar')

assert_equal 'rab', @I18n.translate(:foo, :locale => 'en')
# FIXME: this fails under 1.8.7
# assert_equal 'rab', @I18n.t(:foo, :locale => 'en')
assert_equal 'rab', @I18n.t(:foo, :locale => 'en')
assert_equal 'rab', @I18n.translate!(:foo, :locale => 'en')
assert_equal 'rab', @I18n.t!(:foo, :locale => 'en')
end
Expand Down

0 comments on commit 94b1705

Please sign in to comment.