From 2ac391dbeed94b1934f6db8f23f1687b4e1a103b Mon Sep 17 00:00:00 2001 From: thephez Date: Wed, 10 Jan 2018 11:12:43 -0500 Subject: [PATCH] Update from Ruby 2.0->2.5 - Some dependency updates required --- .travis.yml | 2 +- Gemfile | 4 ++-- Gemfile.lock | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff4df5c8..cda9e5b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - "2.0.0" + - "2.5.0" sudo: false cache: bundler env: diff --git a/Gemfile b/Gemfile index 17d14efd..42fa31f1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' ## version. Then remind one of the site maintainers that they need to ## run `rvm install ` on the build server(s) before they commit ## to master -ruby '2.0.0' +ruby '2.5.0' ## Used on the build server. If you add a package here (like nokogiri) ## that has non-Gem dependencies (like zlib), please remind the site @@ -17,7 +17,7 @@ group :development do ## When we upgrade to Jekyll 3.0.0 or higher, remove ## _plugin/remove-html-extension.rb gem 'jekyll', '~>3.0' - gem 'json' + gem 'json', '>=1.9' gem 'less', '2.4.0' gem 'kramdown' gem 'RedCloth' diff --git a/Gemfile.lock b/Gemfile.lock index 0a1f8d71..291e3e72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM execjs multi_json (>= 1.3) rake - json (1.8.3) + json (2.1.0) json-schema (2.8.0) addressable (>= 2.4) kramdown (1.9.0) @@ -78,9 +78,15 @@ DEPENDENCIES html-proofer (= 2.1.0) jekyll (~> 3.0) jshintrb (~> 0.3.0) - json + json (>= 1.9) json-schema kramdown less (= 2.4.0) safe_yaml therubyracer + +RUBY VERSION + ruby 2.5.0p0 + +BUNDLED WITH + 1.16.1