Skip to content

Commit

Permalink
Remove Rails 3.x, Ruby 1.9.2, Ruby 1.9.3
Browse files Browse the repository at this point in the history
Ruby 1.9.3 will be end-of-lifed on February 23, 2015. We might as well
remove support for it now.
  • Loading branch information
mcmire committed Feb 9, 2015
1 parent f681d35 commit a4045a1
Show file tree
Hide file tree
Showing 29 changed files with 238 additions and 1,437 deletions.
53 changes: 8 additions & 45 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,55 +8,18 @@ branches:
- gh-pages

rvm:
- 1.9.2
- 1.9.3
- 2.0.0
- 2.1.4
- rbx-19mode
- jruby-19mode

gemfile:
- gemfiles/3.0.gemfile
- gemfiles/3.1.gemfile
- gemfiles/3.2.gemfile
- gemfiles/4.0.0.gemfile
- gemfiles/4.0.1.gemfile
- gemfiles/4.1.gemfile
- gemfiles/4.2.gemfile

matrix:
allow_failures:
- rvm: rbx-19mode
- rvm: jruby-19mode
include:
- rvm: 1.9.2
gemfile: gemfiles/3.1_1.9.2.gemfile
- rvm: 1.9.2
gemfile: gemfiles/3.2_1.9.2.gemfile
- rvm: 1.9.3
gemfile: gemfiles/4.0.0.gemfile
- rvm: 1.9.3
gemfile: gemfiles/4.0.1.gemfile
- rvm: 1.9.3
gemfile: gemfiles/4.1.gemfile
- rvm: 2.0.0
gemfile: gemfiles/3.2.gemfile
- rvm: 2.0.0
gemfile: gemfiles/4.0.0.gemfile
- rvm: 2.0.0
gemfile: gemfiles/4.0.1.gemfile
- rvm: 2.0.0
gemfile: gemfiles/4.1.gemfile
- rvm: 2.0.0
gemfile: gemfiles/4.2.gemfile
- rvm: 2.1.4
gemfile: gemfiles/3.2.gemfile
- rvm: 2.1.4
gemfile: gemfiles/4.0.0.gemfile
- rvm: 2.1.4
gemfile: gemfiles/4.0.1.gemfile
- rvm: 2.1.4
gemfile: gemfiles/4.1.gemfile
- rvm: 2.1.4
gemfile: gemfiles/4.2.gemfile
- rvm: rbx-19mode
gemfile: gemfiles/3.2.gemfile
- rvm: jruby-19mode
gemfile: gemfiles/3.2.gemfile
exclude:
- rvm: 1.9.2
gemfile: gemfiles/3.1.gemfile
- rvm: 1.9.2
gemfile: gemfiles/3.2.gemfile
127 changes: 32 additions & 95 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,6 @@ spring = proc do
gem 'spring-commands-rspec'
end

rails_3 = proc do
instance_eval(&shared_dependencies)
gem 'strong_parameters'
gem 'minitest', '~> 4.0'
gem 'minitest-reporters'
end

rails_3_1 = proc do
instance_eval(&rails_3)
gem 'rails', '~> 3.1.8'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails'
gem 'sass-rails', '~> 3.1.5'
gem 'coffee-rails', '~> 3.1.1'
gem 'uglifier', '>= 1.0.3'
gem 'minitest', '~> 4.0'
gem 'minitest-reporters'
end

rails_3_2 = proc do
instance_eval(&rails_3)
gem 'rails', '~> 3.2.13'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails'
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
gem 'minitest', '~> 4.0'
gem 'minitest-reporters'
end

rails_4 = proc do
instance_eval(&shared_dependencies)
instance_eval(&spring)
Expand All @@ -63,73 +32,41 @@ end

#---

if Gem::Requirement.new('< 2').satisfied_by?(ruby_version)
appraise '3.0' do
instance_eval(&rails_3)
gem 'rails', '~> 3.0.17'
end

if Gem::Requirement.new('= 1.9.2').satisfied_by?(ruby_version)
appraise '3.1-1.9.2' do
instance_eval(&rails_3_1)
gem 'turn', '0.8.2'
end
else
appraise '3.1' do
instance_eval(&rails_3_1)
gem 'turn', '~> 0.8.3'
end
end
appraise '4.0.0' do
instance_eval(&rails_4)
gem 'rails', '4.0.0'
gem 'jbuilder', '~> 1.2'
gem 'sass-rails', '~> 4.0.0'
gem 'bcrypt-ruby', '~> 3.0.0'
end

if Gem::Requirement.new('= 1.9.2').satisfied_by?(ruby_version)
appraise '3.2-1.9.2' do
instance_eval(&rails_3_2)
end
else
appraise '3.2' do
instance_eval(&rails_3_2)
instance_eval(&spring)
end
appraise '4.0.1' do
instance_eval(&rails_4)
gem 'rails', '4.0.1'
gem 'jbuilder', '~> 1.2'
gem 'sass-rails', '~> 4.0.0'
gem 'bcrypt-ruby', '~> 3.1.2'
end

if Gem::Requirement.new('> 1.9.2').satisfied_by?(ruby_version)
appraise '4.0.0' do
instance_eval(&rails_4)
gem 'rails', '4.0.0'
gem 'jbuilder', '~> 1.2'
gem 'sass-rails', '~> 4.0.0'
gem 'bcrypt-ruby', '~> 3.0.0'
end

appraise '4.0.1' do
instance_eval(&rails_4)
gem 'rails', '4.0.1'
gem 'jbuilder', '~> 1.2'
gem 'sass-rails', '~> 4.0.0'
gem 'bcrypt-ruby', '~> 3.1.2'
end

appraise '4.1' do
instance_eval(&rails_4)
gem 'rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'sass-rails', '~> 4.0.3'
gem 'sdoc', '~> 0.4.0'
gem 'bcrypt', '~> 3.1.7'
gem 'protected_attributes', "~> 1.0.6"
gem 'spring'
end
appraise '4.1' do
instance_eval(&rails_4)
gem 'rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'sass-rails', '~> 4.0.3'
gem 'sdoc', '~> 0.4.0'
gem 'bcrypt', '~> 3.1.7'
gem 'protected_attributes', "~> 1.0.6"
gem 'spring'
end

appraise '4.2' do
instance_eval(&rails_4)
gem 'rails', '~> 4.2.0'
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0'
gem 'bcrypt', '~> 3.1.7'
gem 'spring'
gem 'protected_attributes', "~> 1.0.6"
end
appraise '4.2' do
instance_eval(&rails_4)
gem 'rails', '~> 4.2.0'
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0'
gem 'bcrypt', '~> 3.1.7'
gem 'spring'
gem 'protected_attributes', "~> 1.0.6"
end
26 changes: 0 additions & 26 deletions gemfiles/3.0.gemfile

This file was deleted.

153 changes: 0 additions & 153 deletions gemfiles/3.0.gemfile.lock

This file was deleted.

Loading

0 comments on commit a4045a1

Please sign in to comment.