From 8833982fe6d353d6bfec04a505f8592ed1d21a99 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 26 Aug 2017 09:49:44 -0700 Subject: [PATCH] Update dependencies (#3245) * Update dependencies * Remove more things we don't need --- .ruby-version | 2 +- Gemfile | 10 ------- Gemfile.lock | 73 ++++++++++++++++----------------------------------- _config.yml | 5 +--- 4 files changed, 25 insertions(+), 65 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2bf1c1ccf36..005119baaa0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.4.1 diff --git a/Gemfile b/Gemfile index 58b50178659..c30860255d8 100644 --- a/Gemfile +++ b/Gemfile @@ -3,18 +3,9 @@ source "https://rubygems.org" group :development do gem 'rake', '~> 10.0' gem 'jekyll', '~> 3.0' - gem 'pygments.rb', '~> 1.1.2' - gem 'rdiscount', '~> 2.0' - gem 'RedCloth', '~> 4.2' - gem 'haml', '~> 4.0' gem 'compass', '~> 0.12' gem 'sass-globbing', '~> 1.0' - gem 'rubypants', '~> 0.2' - gem 'rb-fsevent', '~> 0.9' gem 'stringex', '~> 1.4' - gem 'execjs' - gem 'therubyracer', :platforms => :ruby - gem 'coderay' gem 'pry' end @@ -24,7 +15,6 @@ group :jekyll_plugins do gem 'jekyll-sitemap' gem 'jekyll-time-to-read' gem 'octopress', '~> 3.0' - gem 'octopress-filters' gem 'octopress-include-tag' end diff --git a/Gemfile.lock b/Gemfile.lock index 11bd6af12e2..d706705eb30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,51 +1,47 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.3.2) - addressable (2.4.0) - chunky_png (1.3.6) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + chunky_png (1.3.8) coderay (1.1.1) colorator (1.1.0) compass (0.12.7) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.2.19) - execjs (2.7.0) - ffi (1.9.14) + ffi (1.9.18) forwardable-extended (2.6.0) fssm (0.2.10) - haml (4.0.7) - tilt - jekyll (3.2.1) + jekyll (3.5.2) + addressable (~> 2.4) colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 3.0) + liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.11.0) - jekyll (>= 2.0) + jekyll-redirect-from (0.12.1) + jekyll (~> 3.3) jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-sitemap (0.11.0) - addressable (~> 2.4.0) + jekyll-sitemap (1.1.1) + jekyll (~> 3.3) jekyll-time-to-read (0.1.2) jekyll jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) - kramdown (1.12.0) - libv8 (3.16.14.15) - liquid (3.0.6) + kramdown (1.14.0) + liquid (4.0.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) method_source (0.8.2) - multi_json (1.12.1) octopress (3.0.11) jekyll (>= 2.0) mercenary (~> 0.3.2) @@ -58,12 +54,7 @@ GEM colorator octopress-escape-code (2.1.1) jekyll (~> 3.0) - octopress-filters (1.4.0) - jekyll - octopress-hooks (~> 2.0) - rubypants-unicode - titlecase - octopress-hooks (2.6.1) + octopress-hooks (2.6.2) jekyll (>= 2.0) octopress-include-tag (1.1.3) jekyll (>= 2.0) @@ -76,64 +67,46 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pygments.rb (1.1.2) - multi_json (>= 1.0.0) - rack (1.6.4) + public_suffix (3.0.0) + rack (1.6.8) rack-protection (1.5.3) rack rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rdiscount (2.2.0.1) - redcarpet (3.3.4) - ref (2.0.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redcarpet (3.4.0) rouge (1.11.1) - rubypants (0.5.0) - rubypants-unicode (0.2.5) safe_yaml (1.0.4) sass (3.2.19) sass-globbing (1.1.5) sass (>= 3.1) - sinatra (1.4.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) slop (3.6.0) stringex (1.5.1) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) - ref - tilt (2.0.5) + tilt (2.0.8) titlecase (0.1.1) PLATFORMS ruby DEPENDENCIES - RedCloth (~> 4.2) - coderay compass (~> 0.12) - execjs - haml (~> 4.0) jekyll (~> 3.0) jekyll-paginate jekyll-redirect-from jekyll-sitemap jekyll-time-to-read octopress (~> 3.0) - octopress-filters octopress-include-tag pry - pygments.rb (~> 1.1.2) rake (~> 10.0) - rb-fsevent (~> 0.9) - rdiscount (~> 2.0) - rubypants (~> 0.2) sass-globbing (~> 1.0) sinatra (~> 1.4.2) stringex (~> 1.4) - therubyracer BUNDLED WITH - 1.14.6 + 1.15.4 diff --git a/_config.yml b/_config.yml index f62bb660786..9f482b4a630 100644 --- a/_config.yml +++ b/_config.yml @@ -35,8 +35,6 @@ category_dir: blog/categories markdown: kramdown timezone: UTC -# highlighter: coderay - kramdown: input: GFM auto_ids: false @@ -48,10 +46,9 @@ kramdown: highlighter: rouge -gems: +plugins: - jekyll-redirect-from - jekyll-time-to-read - - octopress-filters - octopress-include-tag paginate: 10 # Posts per page on the blog index