From 70875e3ba2cab33d2f4713ef91f0988ae56549f2 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@users.noreply.github.com>
Date: Sat, 18 May 2019 04:12:12 +0530
Subject: [PATCH] Allow testing with Jekyll 4.x (#351)

---
 .travis.yml    | 11 ++++++++++-
 Gemfile        |  2 ++
 minima.gemspec |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2e7029cbd..347284d5b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,15 @@
 language: ruby
 cache: bundler
-rvm: 2.4
+rvm:
+  - 2.6
+  - 2.4
 
+before_install: gem update --system
 install: script/bootstrap
 script: script/cibuild
+
+env:
+  matrix:
+    - JEKYLL_VERSION="~> 3.5"
+    - JEKYLL_VERSION="~> 3.8.0"
+    - JEKYLL_VERSION=">= 4.0.0.pre.alpha1"
diff --git a/Gemfile b/Gemfile
index bb94df8293..46cdbf0279 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,5 @@
 
 source "https://rubygems.org"
 gemspec
+
+gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]
diff --git a/minima.gemspec b/minima.gemspec
index d8e864d0bc..44a757dbb9 100644
--- a/minima.gemspec
+++ b/minima.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
     f.match(%r!^(assets|_(includes|layouts|sass)/|(LICENSE|README)((\.(txt|md|markdown)|$)))!i)
   end
 
-  spec.add_runtime_dependency "jekyll", "~> 3.5"
+  spec.add_runtime_dependency "jekyll", ">= 3.5", "< 5.0"
   spec.add_runtime_dependency "jekyll-feed", "~> 0.9"
   spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.1"