Upgraded jekyll to version 3.3.0

charafau · charafau · commit 07e935d03dfa · 2016-10-18T15:31:56.000+09:00
Upgraded README file with incremental jekyll flag
Added ruby-version and ruby-gemset files for rvm / rbenv
diff --git a/.bundle/config b/.bundle/config
@@ -1,3 +1,3 @@
 ---
-BUNDLE_PATH: vendor/bundle
-BUNDLE_DISABLE_SHARED_GEMS: '1'
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_DISABLE_SHARED_GEMS: "true"
diff --git a/.ruby-gemset b/.ruby-gemset
@@ -0,0 +1 @@
+scala_lang
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.3.0
diff --git a/Gemfile b/Gemfile
@@ -1,2 +1,8 @@
 source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
+ruby RUBY_VERSION
+
+gem "jekyll", "3.3.0"
+# if you have any plugins, put them here
+group :jekyll_plugins do
+  gem "jekyll-redirect-from", "0.11.0"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,129 +1,51 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    activesupport (4.2.5.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.8)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
-    colorator (0.1)
-    ethon (0.8.1)
-      ffi (>= 1.3.0)
-    execjs (2.6.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
-    gemoji (2.1.0)
-    github-pages (46)
-      RedCloth (= 4.2.9)
-      github-pages-health-check (= 0.6.0)
-      jekyll (= 3.0.3)
-      jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.3.1)
-      jekyll-gist (= 1.4.0)
-      jekyll-mentions (= 1.0.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.9.1)
-      jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 0.1.4)
-      jekyll-sitemap (= 0.10.0)
-      jekyll-textile-converter (= 0.1.0)
-      jemoji (= 0.5.1)
-      kramdown (= 1.9.0)
-      liquid (= 3.0.6)
-      mercenary (~> 0.3)
-      rdiscount (= 2.1.8)
-      redcarpet (= 3.3.3)
-      rouge (= 1.10.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (0.6.0)
-      addressable (~> 2.3)
-      net-dns (~> 0.8)
-      public_suffix (~> 1.4)
-      typhoeus (~> 0.7)
-    html-pipeline (2.3.0)
-      activesupport (>= 2, < 5)
-      nokogiri (>= 1.4)
-    i18n (0.7.0)
-    jekyll (3.0.3)
-      colorator (~> 0.1)
+    addressable (2.4.0)
+    colorator (1.1.0)
+    ffi (1.9.14)
+    forwardable-extended (2.6.0)
+    jekyll (3.3.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
       liquid (~> 3.0)
       mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-feed (0.3.1)
-    jekyll-gist (1.4.0)
-      octokit (~> 4.2)
-    jekyll-mentions (1.0.0)
-      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.9.1)
+    jekyll-redirect-from (0.11.0)
       jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-seo-tag (0.1.4)
-      jekyll (>= 2.0)
-    jekyll-sitemap (0.10.0)
-    jekyll-textile-converter (0.1.0)
-      RedCloth (~> 4.0)
-    jekyll-watch (1.3.1)
-      listen (~> 3.0)
-    jemoji (0.5.1)
-      gemoji (~> 2.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 2.0)
-    json (1.8.3)
-    kramdown (1.9.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.12.0)
     liquid (3.0.6)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    mercenary (0.3.5)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    octokit (4.2.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
-    public_suffix (1.5.3)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (3.3.3)
-    rouge (1.10.1)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.21)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    terminal-table (1.5.2)
-    thread_safe (0.3.5)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    sass (3.4.22)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages
+  jekyll (= 3.3.0)
+  jekyll-redirect-from (= 0.11.0)
+
+RUBY VERSION
+   ruby 2.3.0p0
 
 BUNDLED WITH
-   1.10.6
+   1.13.5
diff --git a/README.md b/README.md
@@ -19,29 +19,15 @@ This site uses a Jekyll, a Ruby framework. You'll need Ruby and Bundler installe
 
 cd into the directory where you cloned this repository, then install the required gems with `bundle install`. This will automatically put the gems into `./vendor/bundle`.
 
-Start the server in the context of the bundle:
+Start the server in the context of the bundle (use `-I` for incremental builds):
 
-    bundle exec jekyll serve
+    bundle exec jekyll serve -I
 
-The generated site is available at `http://localhost:4000`
-
-If you add `--watch` at the end of the command line above, Jekyll will automatically watch for changes on the filesystem, and regenerate the site. It can take a few minutes for your changes to appear. Watch Jekyll's output. When you start up you'll see this:
-
-     $ bundle exec jekyll serve --watch
-     Configuration file: /Users/ben/src/scala.github.com/_config.yml
-                 Source: /Users/ben/src/scala.github.com
-            Destination: /Users/ben/src/scala.github.com/_site
-          Generating...
-                     done.
-    Auto-regeneration: enabled for '/Users/ben/src/scala.github.com'
+`It might take around 5 minutes at first but incremental compilations will be fast.`
 
-When you change a file, this output will tell you that jekyll is regenerating. It's not done until it says `done.`
+The generated site is available at `http://localhost:4000`
 
-    Server running... press ctrl-c to stop.
-      Regenerating: 1 files at 2014-11-29 09:19:04 ...done.
-      Regenerating: 3 files at 2014-11-29 09:21:39 ...done.
-      Regenerating: 2 files at 2014-11-29 09:25:10 ...done.
-      Regenerating: 2 files at 2014-11-29 09:27:49
+If you add `--watch` at the end of the command line above, Jekyll will automatically watch for changes on the filesystem, and regenerate the site.
 
 If you get `incompatible encoding` errors when generating the site under Windows, then ensure that the
 console in which you are running jekyll can work with UTF-8 characters. As described in the blog
@@ -61,4 +47,3 @@ There's a free markdown editor for OSX called [Mou](http://25.io/mou/). It's qui
 ## License ##
 
 All documentation contained in this repository is licensed by EPFL under a Creative Commons Attribution-Share Alike 3.0 Unported license ("CC-BY-SA"), unless otherwise noted. By submitting a "pull request," or otherwise contributing to this repository, you implicitly agree to license your contribution under the above CC-BY-SA license. The source code of this website is licensed to EPFL under the [Scala License](http://www.scala-lang.org/node/146), unless otherwise noted.
-
