Merge pull request octokit#616 from octokit/ruby-2-and-beyond

Ruby 2 and beyond
liuapps · Jun 25, 2015 · 5dff4b0 · 5dff4b0
2 parents ab7e0ec + c95a5ac
commit 5dff4b0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 74 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,10 @@ language: ruby
 
 rvm:
   - jruby
-  - rbx
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - rbx-2
+  - 2.0
+  - 2.1
+  - 2.2
 
 bundler_args: --without development
 
@@ -26,5 +25,5 @@ before_script:
 
 matrix:
   allow_failures:
-    - rvm: rbx
+    - rvm: rbx-2
     - rvm: jruby
diff --git a/Gemfile b/Gemfile
@@ -16,7 +16,7 @@ end
 
 group :test do
   gem 'coveralls', :require => false
-  gem 'json', '~> 1.7', :platforms => [:ruby_18, :jruby]
+  gem 'json', '~> 1.7', :platforms => [:jruby]
   gem 'multi_json', '~> 1.11.0'
   gem 'mime-types', '< 2.0.0'
   gem 'netrc', '~> 0.7.7'

diff --git a/README.md b/README.md
@@ -595,10 +595,9 @@ when writing new specs.
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.9.2
-* Ruby 1.9.3
-* Ruby 2.0.0
-* Ruby 2.1.0
+* Ruby 2.0
+* Ruby 2.1
+* Ruby 2.2
 
 If something doesn't work on one of these Ruby versions, it's a bug.
 

diff --git a/lib/octokit/backports/uri.rb b/lib/octokit/backports/uri.rb
diff --git a/lib/octokit/client/pub_sub_hubbub.rb b/lib/octokit/client/pub_sub_hubbub.rb
@@ -1,10 +1,3 @@
-major, minor, patch = RUBY_VERSION.split('.').map(&:to_i)
-
-if (major == 1 && minor < 9) || (major == 1 && minor == 9 && patch < 2)
-  # pull in backports
-  require 'octokit/backports/uri'
-end
-
 module Octokit
   class Client