From 6b44469676f7a81cbd73bf538cb12bf4a4c0857e Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 3 Jan 2019 00:57:01 +0100 Subject: [PATCH 1/5] style: Target Ruby 2.4 --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index c2504a32..08ae1f2b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ inherit_gem: rubocop-jekyll: .rubocop.yml AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.4 Include: - lib/**/*.rb From cf17b53735ded19c83c885f2d3d19ef4ad2efcb1 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 3 Jan 2019 00:57:39 +0100 Subject: [PATCH 2/5] chore(ci): add Ruby 2.6, drop Ruby 2.3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfe5110b..59609160 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: ruby cache: bundler sudo: false rvm: -- 2.5 -- 2.3 +- 2.6 +- 2.4 env: global: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true From 77e32fa0e0c65957991d74f404042e3083656d30 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 3 Jan 2019 12:55:14 +0100 Subject: [PATCH 3/5] chore(deps): rubocop-jekyll 0.5 --- jekyll-feed.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-feed.gemspec b/jekyll-feed.gemspec index 593f9195..12ac02d3 100644 --- a/jekyll-feed.gemspec +++ b/jekyll-feed.gemspec @@ -25,6 +25,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "nokogiri", "~> 1.6" spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.0" - spec.add_development_dependency "rubocop-jekyll", "~> 0.4" + spec.add_development_dependency "rubocop-jekyll", "~> 0.5" spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0" end From e61f0e1d4b35d52e08eec8214087cbc68775b719 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 3 Jan 2019 12:57:35 +0100 Subject: [PATCH 4/5] style: Style/IfUnlessModifier --- Gemfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9a5d6595..e5cf9dca 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,4 @@ source "https://rubygems.org" gemspec -if ENV["JEKYLL_VERSION"] - gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}" -end +gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}" if ENV["JEKYLL_VERSION"] From 3f9c972c5b62308e7c0d55409c899b68abacc1c4 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Thu, 3 Jan 2019 13:14:37 +0100 Subject: [PATCH 5/5] chore(deps): use latest bundler --- jekyll-feed.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-feed.gemspec b/jekyll-feed.gemspec index 12ac02d3..e62f86ba 100644 --- a/jekyll-feed.gemspec +++ b/jekyll-feed.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.3.0" spec.add_dependency "jekyll", "~> 3.3" - spec.add_development_dependency "bundler", "~> 1.15" + spec.add_development_dependency "bundler" spec.add_development_dependency "nokogiri", "~> 1.6" spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.0"