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:
parent
535fe05be8
commit
56ded0548d
|
@ -10,6 +10,7 @@ branches:
|
||||||
rvm:
|
rvm:
|
||||||
- 2.0.0
|
- 2.0.0
|
||||||
- 2.1.4
|
- 2.1.4
|
||||||
|
- 2.2.0
|
||||||
- rbx-19mode
|
- rbx-19mode
|
||||||
- jruby-19mode
|
- jruby-19mode
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
ruby_version = Gem::Version.new(RUBY_VERSION + '')
|
ruby_version = Gem::Version.new(RUBY_VERSION + '')
|
||||||
|
|
||||||
shared_dependencies = proc do
|
shared_dependencies = proc do
|
||||||
gem 'rspec-rails', '~> 3.0'
|
gem 'rspec-rails', '>= 3.2.0', '< 4'
|
||||||
gem 'shoulda-context', '~> 1.2.0'
|
gem 'shoulda-context', '~> 1.2.0'
|
||||||
gem 'sqlite3', platform: :ruby
|
gem 'sqlite3', platform: :ruby
|
||||||
gem 'activerecord-jdbc-adapter', platform: :jruby
|
gem 'activerecord-jdbc-adapter', platform: :jruby
|
||||||
|
|
4
Gemfile
4
Gemfile
|
@ -4,8 +4,8 @@ gem 'appraisal', '~> 1.0'
|
||||||
gem 'bundler', '~> 1.1'
|
gem 'bundler', '~> 1.1'
|
||||||
gem 'pry-nav'
|
gem 'pry-nav'
|
||||||
gem 'rake', '~> 10.0'
|
gem 'rake', '~> 10.0'
|
||||||
gem 'rspec-core', '~> 3.0'
|
gem 'rspec-core', '>= 3.2.0', '< 4'
|
||||||
gem 'rspec-expectations', '~> 3.0'
|
gem 'rspec-expectations', '>= 3.2.0', '< 4'
|
||||||
|
|
||||||
# YARD
|
# YARD
|
||||||
gem 'yard'
|
gem 'yard'
|
||||||
|
|
|
@ -42,7 +42,7 @@ DEPENDENCIES
|
||||||
pygments.rb
|
pygments.rb
|
||||||
rake (~> 10.0)
|
rake (~> 10.0)
|
||||||
redcarpet
|
redcarpet
|
||||||
rspec-core (~> 3.0)
|
rspec-core (>= 3.2.0, < 4)
|
||||||
rspec-expectations (~> 3.0)
|
rspec-expectations (>= 3.2.0, < 4)
|
||||||
watchr
|
watchr
|
||||||
yard
|
yard
|
||||||
|
|
|
@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
|
||||||
gem "bundler", "~> 1.1"
|
gem "bundler", "~> 1.1"
|
||||||
gem "pry-nav"
|
gem "pry-nav"
|
||||||
gem "rake", "~> 10.0"
|
gem "rake", "~> 10.0"
|
||||||
gem "rspec-core", "~> 3.0"
|
gem "rspec-core", ">= 3.2.0", "< 4"
|
||||||
gem "rspec-expectations", "~> 3.0"
|
gem "rspec-expectations", ">= 3.2.0", "< 4"
|
||||||
gem "yard"
|
gem "yard"
|
||||||
gem "redcarpet"
|
gem "redcarpet"
|
||||||
gem "pygments.rb"
|
gem "pygments.rb"
|
||||||
gem "watchr"
|
gem "watchr"
|
||||||
gem "rspec-rails", "~> 3.0"
|
gem "rspec-rails", ">= 3.2.0", "< 4"
|
||||||
gem "shoulda-context", "~> 1.2.0"
|
gem "shoulda-context", "~> 1.2.0"
|
||||||
gem "sqlite3", :platform => :ruby
|
gem "sqlite3", :platform => :ruby
|
||||||
gem "activerecord-jdbc-adapter", :platform => :jruby
|
gem "activerecord-jdbc-adapter", :platform => :jruby
|
||||||
|
|
|
@ -187,9 +187,9 @@ DEPENDENCIES
|
||||||
rails (= 4.0.0)
|
rails (= 4.0.0)
|
||||||
rake (~> 10.0)
|
rake (~> 10.0)
|
||||||
redcarpet
|
redcarpet
|
||||||
rspec-core (~> 3.0)
|
rspec-core (>= 3.2.0, < 4)
|
||||||
rspec-expectations (~> 3.0)
|
rspec-expectations (>= 3.2.0, < 4)
|
||||||
rspec-rails (~> 3.0)
|
rspec-rails (>= 3.2.0, < 4)
|
||||||
sass-rails (~> 4.0.0)
|
sass-rails (~> 4.0.0)
|
||||||
sdoc
|
sdoc
|
||||||
shoulda-context (~> 1.2.0)
|
shoulda-context (~> 1.2.0)
|
||||||
|
|
|
@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
|
||||||
gem "bundler", "~> 1.1"
|
gem "bundler", "~> 1.1"
|
||||||
gem "pry-nav"
|
gem "pry-nav"
|
||||||
gem "rake", "~> 10.0"
|
gem "rake", "~> 10.0"
|
||||||
gem "rspec-core", "~> 3.0"
|
gem "rspec-core", ">= 3.2.0", "< 4"
|
||||||
gem "rspec-expectations", "~> 3.0"
|
gem "rspec-expectations", ">= 3.2.0", "< 4"
|
||||||
gem "yard"
|
gem "yard"
|
||||||
gem "redcarpet"
|
gem "redcarpet"
|
||||||
gem "pygments.rb"
|
gem "pygments.rb"
|
||||||
gem "watchr"
|
gem "watchr"
|
||||||
gem "rspec-rails", "~> 3.0"
|
gem "rspec-rails", ">= 3.2.0", "< 4"
|
||||||
gem "shoulda-context", "~> 1.2.0"
|
gem "shoulda-context", "~> 1.2.0"
|
||||||
gem "sqlite3", :platform => :ruby
|
gem "sqlite3", :platform => :ruby
|
||||||
gem "activerecord-jdbc-adapter", :platform => :jruby
|
gem "activerecord-jdbc-adapter", :platform => :jruby
|
||||||
|
|
|
@ -187,9 +187,9 @@ DEPENDENCIES
|
||||||
rails (= 4.0.1)
|
rails (= 4.0.1)
|
||||||
rake (~> 10.0)
|
rake (~> 10.0)
|
||||||
redcarpet
|
redcarpet
|
||||||
rspec-core (~> 3.0)
|
rspec-core (>= 3.2.0, < 4)
|
||||||
rspec-expectations (~> 3.0)
|
rspec-expectations (>= 3.2.0, < 4)
|
||||||
rspec-rails (~> 3.0)
|
rspec-rails (>= 3.2.0, < 4)
|
||||||
sass-rails (~> 4.0.0)
|
sass-rails (~> 4.0.0)
|
||||||
sdoc
|
sdoc
|
||||||
shoulda-context (~> 1.2.0)
|
shoulda-context (~> 1.2.0)
|
||||||
|
|
|
@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
|
||||||
gem "bundler", "~> 1.1"
|
gem "bundler", "~> 1.1"
|
||||||
gem "pry-nav"
|
gem "pry-nav"
|
||||||
gem "rake", "~> 10.0"
|
gem "rake", "~> 10.0"
|
||||||
gem "rspec-core", "~> 3.0"
|
gem "rspec-core", ">= 3.2.0", "< 4"
|
||||||
gem "rspec-expectations", "~> 3.0"
|
gem "rspec-expectations", ">= 3.2.0", "< 4"
|
||||||
gem "yard"
|
gem "yard"
|
||||||
gem "redcarpet"
|
gem "redcarpet"
|
||||||
gem "pygments.rb"
|
gem "pygments.rb"
|
||||||
gem "watchr"
|
gem "watchr"
|
||||||
gem "rspec-rails", "~> 3.0"
|
gem "rspec-rails", ">= 3.2.0", "< 4"
|
||||||
gem "shoulda-context", "~> 1.2.0"
|
gem "shoulda-context", "~> 1.2.0"
|
||||||
gem "sqlite3", :platform => :ruby
|
gem "sqlite3", :platform => :ruby
|
||||||
gem "activerecord-jdbc-adapter", :platform => :jruby
|
gem "activerecord-jdbc-adapter", :platform => :jruby
|
||||||
|
|
|
@ -184,9 +184,9 @@ DEPENDENCIES
|
||||||
rails (~> 4.1.0)
|
rails (~> 4.1.0)
|
||||||
rake (~> 10.0)
|
rake (~> 10.0)
|
||||||
redcarpet
|
redcarpet
|
||||||
rspec-core (~> 3.0)
|
rspec-core (>= 3.2.0, < 4)
|
||||||
rspec-expectations (~> 3.0)
|
rspec-expectations (>= 3.2.0, < 4)
|
||||||
rspec-rails (~> 3.0)
|
rspec-rails (>= 3.2.0, < 4)
|
||||||
sass-rails (~> 4.0.3)
|
sass-rails (~> 4.0.3)
|
||||||
sdoc (~> 0.4.0)
|
sdoc (~> 0.4.0)
|
||||||
shoulda-context (~> 1.2.0)
|
shoulda-context (~> 1.2.0)
|
||||||
|
|
|
@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0"
|
||||||
gem "bundler", "~> 1.1"
|
gem "bundler", "~> 1.1"
|
||||||
gem "pry-nav"
|
gem "pry-nav"
|
||||||
gem "rake", "~> 10.0"
|
gem "rake", "~> 10.0"
|
||||||
gem "rspec-core", "~> 3.0"
|
gem "rspec-core", ">= 3.2.0", "< 4"
|
||||||
gem "rspec-expectations", "~> 3.0"
|
gem "rspec-expectations", ">= 3.2.0", "< 4"
|
||||||
gem "yard"
|
gem "yard"
|
||||||
gem "redcarpet"
|
gem "redcarpet"
|
||||||
gem "pygments.rb"
|
gem "pygments.rb"
|
||||||
gem "watchr"
|
gem "watchr"
|
||||||
gem "rspec-rails", "~> 3.0"
|
gem "rspec-rails", ">= 3.2.0", "< 4"
|
||||||
gem "shoulda-context", "~> 1.2.0"
|
gem "shoulda-context", "~> 1.2.0"
|
||||||
gem "sqlite3", :platform => :ruby
|
gem "sqlite3", :platform => :ruby
|
||||||
gem "activerecord-jdbc-adapter", :platform => :jruby
|
gem "activerecord-jdbc-adapter", :platform => :jruby
|
||||||
|
|
|
@ -211,9 +211,9 @@ DEPENDENCIES
|
||||||
rails (~> 4.2.0)
|
rails (~> 4.2.0)
|
||||||
rake (~> 10.0)
|
rake (~> 10.0)
|
||||||
redcarpet
|
redcarpet
|
||||||
rspec-core (~> 3.0)
|
rspec-core (>= 3.2.0, < 4)
|
||||||
rspec-expectations (~> 3.0)
|
rspec-expectations (>= 3.2.0, < 4)
|
||||||
rspec-rails (~> 3.0)
|
rspec-rails (>= 3.2.0, < 4)
|
||||||
sass-rails (~> 5.0)
|
sass-rails (~> 5.0)
|
||||||
sdoc (~> 0.4.0)
|
sdoc (~> 0.4.0)
|
||||||
shoulda-context (~> 1.2.0)
|
shoulda-context (~> 1.2.0)
|
||||||
|
|
Loading…
Reference in New Issue