From 36194fe32bb2998c22471b6c8b83624d7523be58 Mon Sep 17 00:00:00 2001 From: Cinnapple Date: Wed, 9 May 2018 07:13:15 -0700 Subject: [PATCH 1/2] applied minimal fixes to make the theme compatible with Jekyll 3.x --- Gemfile | 15 ++++++++++++++ Gemfile.lock | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 +++ _config.yml | 5 ++--- 4 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..0f4c38f43 --- /dev/null +++ b/Gemfile @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "jekyll", "~> 3.6.0" + +group :jekyll_plugins do + gem "jekyll-feed", "~> 0.6" + gem "jekyll-paginate", "~> 1.1.0" +end + +require 'rbconfig' + if RbConfig::CONFIG['target_os'] =~ /darwin(1[0-3])/i + gem 'rb-fsevent', '<= 0.9.4' + end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..432d31d70 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,58 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + colorator (1.1.0) + ffi (1.9.23) + forwardable-extended (2.6.0) + jekyll (3.6.2) + addressable (~> 2.4) + colorator (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.14) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 3) + safe_yaml (~> 1.0) + jekyll-feed (0.9.3) + jekyll (~> 3.3) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-watch (1.5.1) + listen (~> 3.0) + kramdown (1.16.2) + liquid (4.0.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + mercenary (0.3.6) + pathutil (0.16.1) + forwardable-extended (~> 2.6) + public_suffix (3.0.2) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rouge (2.2.1) + ruby_dep (1.5.0) + safe_yaml (1.0.4) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll (~> 3.6.0) + jekyll-feed (~> 0.6) + jekyll-paginate (~> 1.1.0) + +BUNDLED WITH + 1.16.1 diff --git a/README.md b/README.md index 00f65a77a..191e36f5f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +> *Mickey theme compatible with Jekyll 3.x. with minimal fixes.* To install, do `bundle install` then `bundle exec jekyll serve` + + # Mickey Mickey is a minimal one-column, responsive theme for [Jekyll](http://jekyllrb.com). diff --git a/_config.yml b/_config.yml index fecf957fe..56880d123 100644 --- a/_config.yml +++ b/_config.yml @@ -1,11 +1,10 @@ # Syntax highlighting -markdown: redcarpet -highlighter: pygments +markdown: kramdown +highlighter: rouge # Permalinks permalink: /:title -relative_permalinks: true # Setup timezone: your timezone # eg. Asia/Kathmandu From ec17347a405ec9b9dc61743383930a5978a83acf Mon Sep 17 00:00:00 2001 From: Devdutt Shenoi Date: Tue, 28 May 2019 18:59:42 +0530 Subject: [PATCH 2/2] Upgrade Jekyll Version --- Gemfile | 2 +- Gemfile.lock | 53 +++++++++++++++++++++++++++------------------------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 0f4c38f43..d8dfccb7c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "jekyll", "~> 3.6.0" +gem "jekyll" group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" diff --git a/Gemfile.lock b/Gemfile.lock index 432d31d70..966cd6134 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,55 +4,58 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - ffi (1.9.23) + concurrent-ruby (1.0.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) + ffi (1.10.0) forwardable-extended (2.6.0) - jekyll (3.6.2) + http_parser.rb (0.6.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + jekyll (3.8.5) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (>= 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) + jekyll-watch (~> 2.0) kramdown (~> 1.14) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (>= 1.7, < 3) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.9.3) - jekyll (~> 3.3) + jekyll-feed (0.12.1) + jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-watch (1.5.1) + jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.16.2) - liquid (4.0.0) + kramdown (1.17.0) + liquid (4.0.3) listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) mercenary (0.3.6) - pathutil (0.16.1) + pathutil (0.14.0) forwardable-extended (~> 2.6) - public_suffix (3.0.2) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (2.2.1) - ruby_dep (1.5.0) + public_suffix (3.0.1) + rb-inotify (0.10.0) + ffi (~> 1.0) + rouge (3.3.0) safe_yaml (1.0.4) - sass (3.5.6) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sass (3.7.3) + listen PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.6.0) + jekyll jekyll-feed (~> 0.6) jekyll-paginate (~> 1.1.0) BUNDLED WITH - 1.16.1 + 1.17.2