Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop ruby < 2.2.2 #2169

Merged
merged 3 commits into from Jan 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions .travis.yml
Expand Up @@ -6,16 +6,15 @@ before_install:
install:
- bundle update
rvm:
- rbx-2
- jruby
- jruby-head
- 1.9.3
- 2.0.0
- 2.1
- 2.2.2
- 2.3.0
- 2.3.3
- 2.4.1
- 2.4.3
- 2.5.0
- ruby-head
- rbx-2
- jruby
- jruby-head
notifications:
irc: 'irc.freenode.org#padrino'
recipients:
Expand All @@ -32,22 +31,23 @@ branches:
only:
- master
- 0.12
- 0.14
services: mongodb
matrix:
include:
- rvm: 2.2.2
- rvm: 2.3.3
env: SINATRA_EDGE=true
- rvm: 2.1
- rvm: 2.3.3
env: ERB_ENGINE=stdlib
- rvm: 2.1
- rvm: 2.3.3
env: ERB_ENGINE=erubis
- rvm: 2.1
- rvm: 2.3.3
env: HAML_ENGINE=hamlit
- rvm: 2.1
- rvm: 2.3.3
env: AS_VERSION=3.2
allow_failures:
- rvm: jruby-9.0.5.0
- rvm: rbx-2
- env: SINATRA_EDGE=true
- rvm: ruby-head
- rvm: jruby
- rvm: jruby-head
- rvm: ruby-head
- env: SINATRA_EDGE=true
23 changes: 4 additions & 19 deletions Gemfile
Expand Up @@ -19,31 +19,16 @@ group :development do
elsif ENV['SINATRA_EDGE']
puts "=> Using sinatra edge"
gem "sinatra", :git => "git://github.com/sinatra/sinatra.git"
elsif RUBY_VERSION < "2.2.0"
gem "sinatra", "< 2"
end

if RUBY_VERSION < "2.0.0"
gem "slim", ">= 1.3.0", "< 3"
else
gem "slim", ">= 1.3.0"
end

if RUBY_VERSION < "2.1.0"
gem "liquid", ">= 2.1.1", "< 4"
else
gem "liquid", ">= 2.1.1"
end
gem "slim", ">= 1.3.0"
gem "liquid", ">= 2.1.1"

if ENV['HAML_ENGINE'] == 'hamlit' && RUBY_VERSION >= "2.0.0"
if ENV['HAML_ENGINE'] == 'hamlit'
puts "=> Using Hamlit Haml engine"
gem "hamlit"
else
if RUBY_VERSION < "2.0.0"
gem "haml", ">= 4.0.5", "< 5"
else
gem "haml", ">= 4.0.5"
end
gem "haml", ">= 4.0.5"
end

case ENV['ERB_ENGINE']
Expand Down
4 changes: 1 addition & 3 deletions padrino-core/padrino-core.gemspec
Expand Up @@ -24,8 +24,6 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--charset=UTF-8"]

s.add_dependency("padrino-support", Padrino.version)
s.add_dependency("sinatra", ">= 1.4.6")
s.add_dependency("mustermann19")
s.add_dependency("sinatra", ">= 2.0.0")
s.add_dependency("thor", "~> 0.18")
s.add_dependency("rack-protection", ">= 1.5.0")
end
1 change: 0 additions & 1 deletion padrino-core/test/test_routing.rb
Expand Up @@ -2255,7 +2255,6 @@ def authorize(username, password)
end

it "should support named captures like %r{/hello/(?<person>[^/?#]+)} on Ruby >= 1.9" do
next if RUBY_VERSION < '1.9'
mock_app do
get Regexp.new('/hello/(?<person>[^/?#]+)') do
"Hello #{params['person']}"
Expand Down
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

# Padrino supports Ruby version 1.9 and later
# Padrino supports Ruby version 2.2.2 and later
# ruby '<%= RUBY_VERSION.to_s %>'

# Distribute your app as a gem
Expand Down