Raise supported/expected dependency versions

Drop Travis testing for Ruby versions lower than 2.2 (or equivalent).

.travis.yml

@@ -2,11 +2,6 @@
 language: ruby
 
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1
   - 2.2
   - rbx-2
   - jruby
@@ -17,8 +12,6 @@ sudo: false
 
 matrix:
   include:
-    - { rvm: 1.8.7, env: tilt=master }
-    - { rvm: 1.9.3, env: tilt=master }
     - { rvm: 2.2, env: rack=master }
     - { rvm: 2.2, env: tilt=master }
   allow_failures:

Gemfile

@@ -33,7 +33,7 @@ if RUBY_ENGINE == 'jruby'
   gem 'trinidad'
 end
 
-if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
+if RUBY_ENGINE == "ruby"
   gem 'less', '~> 2.0'
   gem 'therubyracer'
   gem 'redcarpet'
@@ -71,6 +71,6 @@ if RUBY_ENGINE == "rbx"
   gem 'rubysl-test-unit'
 end
 
-platforms :ruby_18, :jruby do
+platforms :jruby do
-  gem 'json' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
+  gem 'json'
 end

lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.4.6'
+  VERSION = '2.0.0'
 end

sinatra.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'
   s.rdoc_options      = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc --encoding=UTF-8]
 
-  s.add_dependency 'rack', '~> 1.5', '>= 1.5.4', '< 1.6'
+  s.add_dependency 'rack', '~> 1.6'
-  s.add_dependency 'tilt', '>= 1.3', '< 3'
+  s.add_dependency 'tilt', '~> 2.0'
-  s.add_dependency 'rack-protection', '~> 1.4'
+  s.add_dependency 'rack-protection', '~> 1.5'
 end