Add support for Ruby 2.2

Secondary author: Luciano Sousa <ls@lucianosousa.net>

Also, upgrade to rspec-rails 3.2.0 explicitly. (See
b7fe87ae91 for an explanation of why 3.2.0
is necessary here.)
This commit is contained in:
Elliot Winkler 2014-12-28 14:54:33 -03:00
parent 535fe05be8
commit 56ded0548d
12 changed files with 30 additions and 29 deletions

View File

@ -10,6 +10,7 @@ branches:
rvm:
- 2.0.0
- 2.1.4
- 2.2.0
- rbx-19mode
- jruby-19mode

View File

@ -1,7 +1,7 @@
ruby_version = Gem::Version.new(RUBY_VERSION + '')
shared_dependencies = proc do
gem 'rspec-rails', '~> 3.0'
gem 'rspec-rails', '>= 3.2.0', '< 4'
gem 'shoulda-context', '~> 1.2.0'
gem 'sqlite3', platform: :ruby
gem 'activerecord-jdbc-adapter', platform: :jruby

View File

@ -4,8 +4,8 @@ gem 'appraisal', '~> 1.0'
gem 'bundler', '~> 1.1'
gem 'pry-nav'
gem 'rake', '~> 10.0'
gem 'rspec-core', '~> 3.0'
gem 'rspec-expectations', '~> 3.0'
gem 'rspec-core', '>= 3.2.0', '< 4'
gem 'rspec-expectations', '>= 3.2.0', '< 4'
# YARD
gem 'yard'

View File

@ -42,7 +42,7 @@ DEPENDENCIES
pygments.rb
rake (~> 10.0)
redcarpet
rspec-core (~> 3.0)
rspec-expectations (~> 3.0)
rspec-core (>= 3.2.0, < 4)
rspec-expectations (>= 3.2.0, < 4)
watchr
yard

View File

@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
gem "bundler", "~> 1.1"
gem "pry-nav"
gem "rake", "~> 10.0"
gem "rspec-core", "~> 3.0"
gem "rspec-expectations", "~> 3.0"
gem "rspec-core", ">= 3.2.0", "< 4"
gem "rspec-expectations", ">= 3.2.0", "< 4"
gem "yard"
gem "redcarpet"
gem "pygments.rb"
gem "watchr"
gem "rspec-rails", "~> 3.0"
gem "rspec-rails", ">= 3.2.0", "< 4"
gem "shoulda-context", "~> 1.2.0"
gem "sqlite3", :platform => :ruby
gem "activerecord-jdbc-adapter", :platform => :jruby

View File

@ -187,9 +187,9 @@ DEPENDENCIES
rails (= 4.0.0)
rake (~> 10.0)
redcarpet
rspec-core (~> 3.0)
rspec-expectations (~> 3.0)
rspec-rails (~> 3.0)
rspec-core (>= 3.2.0, < 4)
rspec-expectations (>= 3.2.0, < 4)
rspec-rails (>= 3.2.0, < 4)
sass-rails (~> 4.0.0)
sdoc
shoulda-context (~> 1.2.0)

View File

@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
gem "bundler", "~> 1.1"
gem "pry-nav"
gem "rake", "~> 10.0"
gem "rspec-core", "~> 3.0"
gem "rspec-expectations", "~> 3.0"
gem "rspec-core", ">= 3.2.0", "< 4"
gem "rspec-expectations", ">= 3.2.0", "< 4"
gem "yard"
gem "redcarpet"
gem "pygments.rb"
gem "watchr"
gem "rspec-rails", "~> 3.0"
gem "rspec-rails", ">= 3.2.0", "< 4"
gem "shoulda-context", "~> 1.2.0"
gem "sqlite3", :platform => :ruby
gem "activerecord-jdbc-adapter", :platform => :jruby

View File

@ -187,9 +187,9 @@ DEPENDENCIES
rails (= 4.0.1)
rake (~> 10.0)
redcarpet
rspec-core (~> 3.0)
rspec-expectations (~> 3.0)
rspec-rails (~> 3.0)
rspec-core (>= 3.2.0, < 4)
rspec-expectations (>= 3.2.0, < 4)
rspec-rails (>= 3.2.0, < 4)
sass-rails (~> 4.0.0)
sdoc
shoulda-context (~> 1.2.0)

View File

@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
gem "bundler", "~> 1.1"
gem "pry-nav"
gem "rake", "~> 10.0"
gem "rspec-core", "~> 3.0"
gem "rspec-expectations", "~> 3.0"
gem "rspec-core", ">= 3.2.0", "< 4"
gem "rspec-expectations", ">= 3.2.0", "< 4"
gem "yard"
gem "redcarpet"
gem "pygments.rb"
gem "watchr"
gem "rspec-rails", "~> 3.0"
gem "rspec-rails", ">= 3.2.0", "< 4"
gem "shoulda-context", "~> 1.2.0"
gem "sqlite3", :platform => :ruby
gem "activerecord-jdbc-adapter", :platform => :jruby

View File

@ -184,9 +184,9 @@ DEPENDENCIES
rails (~> 4.1.0)
rake (~> 10.0)
redcarpet
rspec-core (~> 3.0)
rspec-expectations (~> 3.0)
rspec-rails (~> 3.0)
rspec-core (>= 3.2.0, < 4)
rspec-expectations (>= 3.2.0, < 4)
rspec-rails (>= 3.2.0, < 4)
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
shoulda-context (~> 1.2.0)

View File

@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
gem "bundler", "~> 1.1"
gem "pry-nav"
gem "rake", "~> 10.0"
gem "rspec-core", "~> 3.0"
gem "rspec-expectations", "~> 3.0"
gem "rspec-core", ">= 3.2.0", "< 4"
gem "rspec-expectations", ">= 3.2.0", "< 4"
gem "yard"
gem "redcarpet"
gem "pygments.rb"
gem "watchr"
gem "rspec-rails", "~> 3.0"
gem "rspec-rails", ">= 3.2.0", "< 4"
gem "shoulda-context", "~> 1.2.0"
gem "sqlite3", :platform => :ruby
gem "activerecord-jdbc-adapter", :platform => :jruby

View File

@ -211,9 +211,9 @@ DEPENDENCIES
rails (~> 4.2.0)
rake (~> 10.0)
redcarpet
rspec-core (~> 3.0)
rspec-expectations (~> 3.0)
rspec-rails (~> 3.0)
rspec-core (>= 3.2.0, < 4)
rspec-expectations (>= 3.2.0, < 4)
rspec-rails (>= 3.2.0, < 4)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
shoulda-context (~> 1.2.0)