From a7ad1b3275472caf8af867c4d29f1a08cac60915 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Mon, 4 Jul 2016 11:59:36 +0200 Subject: [PATCH] update versions --- .bundle/config | 2 +- Gemfile | 5 +- Gemfile.lock | 144 +++++++++++++++++++++++++++++++++++++------------ _config.yml | 3 ++ 4 files changed, 116 insertions(+), 38 deletions(-) diff --git a/.bundle/config b/.bundle/config index 50b79383c..7d5a37ef3 100644 --- a/.bundle/config +++ b/.bundle/config @@ -1,3 +1,3 @@ --- BUNDLE_PATH: bundle-vendor/bundle -BUNDLE_DISABLE_SHARED_GEMS: '1' +BUNDLE_DISABLE_SHARED_GEMS: true diff --git a/Gemfile b/Gemfile index 22eb5828d..18d88fcc9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,8 @@ source 'https://rubygems.org' -gem 'jekyll', '1.5.1' + +gem 'github-pages', group: :jekyll_plugins + gem 'json', '1.8.3' -gem 'kramdown', '1.8.0' gem 'mercenary', '0.3.5' gem 'posix-spawn', '0.3.11' gem 'yajl-ruby', '1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 0d402e89e..36bd0b466 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,60 +1,134 @@ GEM remote: https://rubygems.org/ specs: - blankslate (2.1.2.4) - classifier (1.3.4) - fast-stemmer (>= 1.0.0) + activesupport (4.0.13) + i18n (~> 0.6, >= 0.6.9) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + addressable (2.4.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) colorator (0.1) - commander (4.1.6) - highline (~> 1.6.11) - fast-stemmer (1.0.2) + ethon (0.9.0) + ffi (>= 1.3.0) + execjs (2.7.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) ffi (1.9.10) - highline (1.6.21) - jekyll (1.5.1) - classifier (~> 1.3) + gemoji (2.1.0) + github-pages (85) + github-pages-health-check (= 1.1.0) + jekyll (= 3.1.6) + jekyll-coffeescript (= 1.0.1) + jekyll-feed (= 0.5.1) + jekyll-gist (= 1.4.0) + jekyll-github-metadata (= 2.0.2) + jekyll-mentions (= 1.1.3) + jekyll-paginate (= 1.1.0) + jekyll-redirect-from (= 0.10.0) + jekyll-sass-converter (= 1.3.0) + jekyll-seo-tag (= 2.0.0) + jekyll-sitemap (= 0.10.0) + jemoji (= 0.6.2) + kramdown (= 1.11.1) + liquid (= 3.0.6) + listen (= 3.0.6) + mercenary (~> 0.3) + rouge (= 1.10.1) + terminal-table (~> 1.4) + github-pages-health-check (1.1.0) + addressable (~> 2.3) + net-dns (~> 0.8) + octokit (~> 4.0) + public_suffix (~> 1.4) + typhoeus (~> 0.7) + html-pipeline (2.4.1) + activesupport (>= 2, < 5) + nokogiri (>= 1.4) + i18n (0.7.0) + jekyll (3.1.6) colorator (~> 0.1) - commander (~> 4.1.3) - liquid (~> 2.5.5) - listen (~> 1.3) - maruku (= 0.7.0) - pygments.rb (~> 0.5.0) - redcarpet (~> 2.3.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-feed (0.5.1) + jekyll-gist (1.4.0) + octokit (~> 4.2) + jekyll-github-metadata (2.0.2) + jekyll (~> 3.1) + octokit (~> 4.0) + jekyll-mentions (1.1.3) + html-pipeline (~> 2.3) + jekyll (~> 3.0) + jekyll-paginate (1.1.0) + jekyll-redirect-from (0.10.0) + jekyll (>= 2.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-seo-tag (2.0.0) + jekyll (~> 3.1) + jekyll-sitemap (0.10.0) + jekyll-watch (1.4.0) + listen (~> 3.0, < 3.1) + jemoji (0.6.2) + gemoji (~> 2.0) + html-pipeline (~> 2.2) + jekyll (>= 3.0) json (1.8.3) - kramdown (1.8.0) - liquid (2.5.5) - listen (1.3.1) + kramdown (1.11.1) + liquid (3.0.6) + listen (3.0.6) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - maruku (0.7.0) + rb-inotify (>= 0.9.7) mercenary (0.3.5) - parslet (1.5.0) - blankslate (~> 2.0) + mini_portile2 (2.1.0) + minitest (4.7.5) + multi_json (1.12.1) + multipart-post (2.0.0) + net-dns (0.8.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + pkg-config (1.1.7) posix-spawn (0.3.11) - pygments.rb (0.5.4) - rb-fsevent (0.9.5) - rb-inotify (0.9.5) + public_suffix (1.5.3) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) - rb-kqueue (0.2.4) - ffi (>= 0.5.0) - redcarpet (2.3.0) + rouge (1.10.1) safe_yaml (1.0.4) - toml (0.1.2) - parslet (~> 1.5.0) + sass (3.4.22) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + terminal-table (1.6.0) + thread_safe (0.3.5) + typhoeus (0.8.0) + ethon (>= 0.8.0) + tzinfo (0.3.50) yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES - jekyll (= 1.5.1) + github-pages json (= 1.8.3) - kramdown (= 1.8.0) mercenary (= 0.3.5) posix-spawn (= 0.3.11) yajl-ruby (= 1.2.1) BUNDLED WITH - 1.10.6 + 1.12.5 diff --git a/_config.yml b/_config.yml index eda60a5fe..57a73d6ee 100644 --- a/_config.yml +++ b/_config.yml @@ -6,3 +6,6 @@ devscalaversion: "2.12.0-M5" baseurl: "" markdown: kramdown exclude: [bundle-vendor] + +kramdown: + input: GFM