aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGibheer <gibheer@gmail.com>2013-07-29 08:45:15 +0200
committerGibheer <gibheer@gmail.com>2013-07-29 08:45:15 +0200
commitd92dea46954b388ec13bc53c6e4f9894f25863c4 (patch)
treec2bf13ac289cafe7a14bd90cea3942ce9cf5bb67
parent2fffda3e1123ea55f88c75e73812d542345a3673 (diff)
drop 1.8 support and add 2.0
As MRI 1.8 is EOL, I think it is okay to drop 1.8 support.
-rw-r--r--.travis.yml11
-rw-r--r--lib/zero.rb5
-rw-r--r--zero.gemspec1
3 files changed, 3 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index f9ad29b..6bb3d2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,10 @@
bundler_args: --without development
language: ruby
rvm:
+ - 2.0.0
+ - jruby-20mode
+ - rbx-20mode
- 1.9.3
- - jruby-18mode
- jruby-19mode
- - rbx-18mode
- rbx-19mode
- - 1.8.7
script: thor spec
-matrix:
- allow_failures:
- - rvm: 1.8.7
- - rvm: rbx-18mode
- - rvm: jruby-18mode
diff --git a/lib/zero.rb b/lib/zero.rb
index 2f18519..baf876c 100644
--- a/lib/zero.rb
+++ b/lib/zero.rb
@@ -1,8 +1,3 @@
-# Only add fixes, if needed to avoid an unnecessary installed gem
-if RUBY_VERSION <= '1.9'
- require 'zero_fix18'
-end
-
module Zero
require 'zero/controller'
require 'zero/router'
diff --git a/zero.gemspec b/zero.gemspec
index 75190b6..b18aeab 100644
--- a/zero.gemspec
+++ b/zero.gemspec
@@ -20,5 +20,4 @@ Gem::Specification.new do |s|
s.rubygems_version = '1.8.24'
s.add_dependency('tilt')
- s.add_dependency('zero-fix18') if RUBY_VERSION <= '1.9'
end