From 6d1b9a802c9fa1638ed0dcb265198948504aaefe Mon Sep 17 00:00:00 2001 From: halo Date: Wed, 25 Mar 2015 14:23:57 +0100 Subject: [PATCH 1/2] Updated dev-dependency eventmachine 1.0.3 -> 0.1.7 Fixes Ruby 2.2 compatibility see https://github.com/eventmachine/eventmachine/pull/503 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f3afcb5..b107762 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ GEM eventmachine rspec (> 2.6.0) test-unit - eventmachine (1.0.3) + eventmachine (1.0.7) rspec (2.13.0) rspec-core (~> 2.13.0) rspec-expectations (~> 2.13.0) From 2088d29879780321f723754e2aff81323e3c96c0 Mon Sep 17 00:00:00 2001 From: halo Date: Wed, 25 Mar 2015 15:42:36 +0100 Subject: [PATCH 2/2] Travis: Test Ruby 2.2.0, too --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 86d97a6..3c540b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ rvm: - 1.9.2 - 1.9.3 - 2.0.0 + - 2.2.0 - jruby-18mode - jruby-19mode - rbx-18mode