From 2133397412365a0d4f683e8e9d1e97f9b308ac34 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Sun, 25 Dec 2016 10:08:49 +0530
Subject: [PATCH 1/4] test against ruby-2.4.0

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

diff --git a/.travis.yml b/.travis.yml
index 6ff7022c7b5..a06a82c4982 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,10 @@ language: ruby
 sudo: false
 
 rvm:
-  - &ruby1 2.3.1
-  - &ruby2 2.2.5
-  - &ruby3 2.1.9
+  - &ruby1 2.4.0
+  - &ruby2 2.3.1
+  - &ruby3 2.2.5
+  - &ruby4 2.1.9
   - &jruby jruby-9.1.2.0
 
 matrix:

From e46381341689824ab274cfb500c03d44fa11ab71 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Sun, 25 Dec 2016 10:09:23 +0530
Subject: [PATCH 2/4] use compatible versions of gems

  - json: "~> 2.0"
    # https://github.com/flori/json/issues/303#issuecomment-259426660

  - pygments.rb: "~> 1.1"
---
 Gemfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index fa254dff81b..867c61dbca8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,13 @@ gemspec :name => "jekyll"
 
 gem "rake", "~> 12.0"
 
+if RUBY_VERSION >= '2.4'
+  gem "json", "~> 2.0"
+  gem "pygments.rb", "~> 1.1"
+else
+  gem "pygments.rb", "~> 0.6.0" unless RUBY_ENGINE == "jruby"
+end
+
 # Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
 gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"
 
@@ -75,7 +82,6 @@ group :jekyll_optional_dependencies do
   platform :ruby, :mswin, :mingw, :x64_mingw do
     gem "classifier-reborn", "~> 2.0"
     gem "liquid-c", "~> 3.0"
-    gem "pygments.rb", "~> 0.6.0"
     gem "rdiscount", "~> 2.0"
     gem "redcarpet", "~> 3.2", ">= 3.2.3"
   end

From 3da459ef33055802074000dd95a94dac8b262574 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Sat, 28 Jan 2017 22:15:34 +0530
Subject: [PATCH 3/4] update rubygems version on travis

---
 .travis.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3543e9aae57..f48eb77a0d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ sudo: false
 
 rvm:
   - &ruby1 2.4.0
-  - &ruby1 2.3.3
-  - &ruby2 2.2.6
-  - &ruby3 2.1.9
+  - &ruby2 2.3.3
+  - &ruby3 2.2.6
+  - &ruby4 2.1.9
   - &jruby jruby-9.1.7.0
 
 matrix:
@@ -17,6 +17,10 @@ matrix:
       env: TEST_SUITE=fmt
     - rvm: *ruby1
       env: TEST_SUITE=default-site
+    - rvm: *ruby2
+      env: TEST_SUITE=fmt
+    - rvm: *ruby2
+      env: TEST_SUITE=default-site
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber
@@ -49,3 +53,6 @@ addons:
 # regular test configuration
 after_success:
   - bundle exec codeclimate-test-reporter
+
+before_install:
+  - gem update --system

From 6123175a7138d1ed6912054abcd4d7fd0c28bbb5 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Sat, 11 Feb 2017 13:58:23 +0530
Subject: [PATCH 4/4] test with pygments 1.1 on all ruby versions

---
 Gemfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index b13bb9084ed..616abfb8d09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,12 +3,7 @@ gemspec :name => "jekyll"
 
 gem "rake", "~> 12.0"
 
-if RUBY_VERSION >= '2.4'
-  gem "json", "~> 2.0"
-  gem "pygments.rb", "~> 1.1"
-else
-  gem "pygments.rb", "~> 0.6.0" unless RUBY_ENGINE == "jruby"
-end
+gem "pygments.rb", "~> 1.1"
 
 # Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
 gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"