Fix stable branch to build on Rubies 1.8.7~2.4.0 #1235
Conversation
Conflicts: lib/sinatra/base.rb
| - 2.1.10 | ||
| - 2.2.6 | ||
| - 2.3.3 | ||
| - 2.4.0 | ||
| - rbx-2 | ||
| - jruby |
There was a problem hiding this comment.
Should we pin this to 9.0.5.0?
There was a problem hiding this comment.
I think this is for JRuby 1.x, which maybe we still support, same for RBX..
Neither of those are failing, so I don't really care too much.
| - 2.1.10 | ||
| - 2.2.6 | ||
| - 2.3.3 | ||
| - 2.4.0 | ||
| - rbx-2 |
There was a problem hiding this comment.
I feel like we should either fix Rubinius, or remove it from Travis altogether.
| gem 'rack-test', '>= 0.6.2' | ||
| gem "minitest", "~> 5.0" | ||
|
|
||
| # Allows stuff like `tilt=1.2.2 bundle install` or `tilt=master ...`. |
There was a problem hiding this comment.
My only concern with removing this is that someone might be using it in production. Duh, retracted, Sinatra's Gemfile won't be used by anything other than Sinatra.
There was a problem hiding this comment.
Yeah, this is only used for our tests.
| @@ -44,7 +33,7 @@ if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2' | |||
| gem 'puma' | |||
| gem 'net-http-server' | |||
| gem 'yajl-ruby' | |||
| gem 'nokogiri' | |||
| gem 'nokogiri', '~> 1.5' | |||
There was a problem hiding this comment.
Try pinning to nokogiri 1.6.8.1. Versions after that require Ruby 2.1.0 or greater.
There was a problem hiding this comment.
When I tried a more elaborate versioning scheme for versions 2.0 and below didn't work and installed the wrong version of nokogiri.
Ignore the errors in that build about i18n, this was fixed by just pinning activesupport and i18n to a much older version that was still supported by everything. Although, admittedly this is really just a consequence of rabl having an open-ended dependency on AS.
|
cc #1231 |
No description provided.