From 69951be173c1c0ca82f880970e938ab39ee6dbaa Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Sat, 28 Jun 2014 16:02:37 -0400
Subject: [PATCH 1/3] Canonicalize travis ruby versions

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cfe3e7ab..be29fe76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 1.9
+  - 2.0
   - 2.1
-  - 2.1.1
   - jruby-19mode
   - jruby-head
   - rbx-19mode

From 1372274fca1be7630215f413c576dbfe2c24f287 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Sat, 28 Jun 2014 16:09:14 -0400
Subject: [PATCH 2/3] Do not intall stackprof under jruby nor rubinius

---
 Gemfile        | 1 +
 liquid.gemspec | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index fa75df15..05cbb03e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
+gem 'stackprof', platforms: :mri_21
diff --git a/liquid.gemspec b/liquid.gemspec
index 1b0ae1ed..0cd2f86a 100644
--- a/liquid.gemspec
+++ b/liquid.gemspec
@@ -24,6 +24,5 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_development_dependency 'stackprof' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.1.0")
   s.add_development_dependency 'rake'
 end

From ac0f63eda95710d8332df8aa9ef03d3566d9de13 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Sat, 28 Jun 2014 16:16:38 -0400
Subject: [PATCH 3/3] rbx-19mode is not supported anymore

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be29fe76..32e84575 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,10 @@ rvm:
   - 2.1
   - jruby-19mode
   - jruby-head
-  - rbx-19mode
+  - rbx-2
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
+    - rvm: rbx-2
     - rvm: jruby-head
 
 script: "rake test"