From 2171b882c167fd05a5ef4483728a1acd2f757563 Mon Sep 17 00:00:00 2001 From: Ali Servet Donmez Date: Fri, 27 Nov 2015 16:14:35 +0100 Subject: [PATCH 1/2] Depend on jekyll at least of version 2.5.0 --- Gemfile | 2 +- jekyll-compose.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index fcaf453..3629ff5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' gemspec -gem "jekyll", ENV["JEKYLL_VERSION"] ? "~> #{ENV["JEKYLL_VERSION"]}" : ">= 2.0" +gem "jekyll", ENV["JEKYLL_VERSION"] ? "~> #{ENV["JEKYLL_VERSION"]}" : ">= 2.5.0" diff --git a/jekyll-compose.gemspec b/jekyll-compose.gemspec index e4fe5f2..55957bc 100644 --- a/jekyll-compose.gemspec +++ b/jekyll-compose.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "rake", "~> 10.0" - spec.add_development_dependency "jekyll", ">= 2.0" + spec.add_development_dependency "jekyll", ">= 2.5.0" spec.add_development_dependency "rspec", "~> 3.0" end From 4bc5050ff307769cf43cc31a82a678639d4d55a9 Mon Sep 17 00:00:00 2001 From: Ali Servet Donmez Date: Fri, 27 Nov 2015 18:01:23 +0100 Subject: [PATCH 2/2] Bump JEKYLL_VERSION 2.0 -> 2.5 for travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 282c326..5866a49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ matrix: include: - rvm: 1.9 - env: JEKYLL_VERSION=2.0 + env: JEKYLL_VERSION=2.5 fast_finish: true env: - "" - JEKYLL_VERSION=3.0 - - JEKYLL_VERSION=2.0 + - JEKYLL_VERSION=2.5