Auto merge of #303 - tejasbubane:update-ruby-2.4, r=segiddins

Update to ruby 2.4 Ruby version was [downgraded](rubygems/bundler-site@61ac8c6) since middleman did not support ruby 2.4, but [now it does!](middleman/middleman#2038). Following gem updates were required: * middleman to version `4.2` and rubyracer to `0.12.3` for this to work. * `builder`, `rake` and `sprockets` to their respective latest versions to remove Fixnum warnings.
illiailli · Jun 9, 2017 · 732bc11 · 732bc11
2 parents 19571f4 + d72cf87
commit 732bc11
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 49 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.3
+2.4.1
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ env:
     - secure: "AWklp5z/n19GoLjf0e6mjwWDBFMURr5evwDW3MyPKJ7WfqKzVfFQ1HVT8HkiviZyz7IksvI+8DOIhsTttP4bwCnS13WbRECrWR1fB2nKSqNC/EnkYFeyuA4sVOBq/AOA3lOEHUWMcsnTXkt4EdYPLtCNRezNhF1FgA5tSNTTFO0="
     - secure: "ky6PZ4r57c42qA1v1Hw6TycojOlDQwcSq+fKalwaCb22wKc6JDyRDVHNjXWliEGe3CAWCwRUVy4FlEoYg8GZwTR7tITGG2rjpWC4Q0MLvO7OyjzfvtNXqf55NoU90aSPe/24YbOD+sLANhB9G5JEYDCsj6SzNHPDMK6lECVC0TE="
 rvm:
-  - 2.3.3
+  - 2.4.1
 install:
   - bundle install --deployment
   - eval "$(ssh-agent -s)"

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 ruby File.read(File.expand_path('../.ruby-version', __FILE__)).strip
 
 gem 'octokit', '~> 4.3'
-gem 'middleman', '~> 4.1'
+gem 'middleman', '~> 4.2'
 gem 'middleman-livereload'
 gem 'middleman-syntax'
 gem 'middleman-blog'
@@ -18,6 +18,7 @@ gem 'builder'
 gem 'bootstrap-sass'
 gem 'jquery-middleman'
 gem 'nokogiri', '~> 1.7'
+gem 'haml', '~> 4.0.7'
 
 group :development do
   gem 'pry'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,27 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7)
+    activesupport (5.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     autoprefixer-rails (6.3.7)
       execjs
-    backports (3.6.8)
+    backports (3.8.0)
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (9.0.5)
     chunky_png (1.3.6)
     coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -34,9 +33,9 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     contracts (0.13.0)
-    dotenv (2.1.1)
+    dotenv (2.2.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -50,9 +49,8 @@ GEM
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
     fast_blank (1.0.0)
-    fastimage (2.0.0)
-      addressable (~> 2)
-    ffi (1.9.14)
+    fastimage (2.1.0)
+    ffi (1.9.18)
     gh (0.14.0)
       addressable
       backports
@@ -64,43 +62,43 @@ GEM
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (3.4.4)
+    hashie (3.5.5)
     highline (1.7.8)
     hpricot (0.8.6)
     htmlcompressor (0.2.0)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     jquery-middleman (3.1.2)
       thor (>= 0.14, < 2.0)
-    json (1.8.6)
-    kramdown (1.11.1)
+    json (2.1.0)
+    kramdown (1.13.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.15)
+    libv8 (3.16.14.19)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    memoist (0.14.0)
+    memoist (0.15.0)
     method_source (0.8.2)
-    middleman (4.1.10)
+    middleman (4.2.1)
       coffee-script (~> 2.2)
       compass-import-once (= 1.0.5)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-cli (= 4.1.10)
-      middleman-core (= 4.1.10)
+      middleman-cli (= 4.2.1)
+      middleman-core (= 4.2.1)
       sass (>= 3.4.0, < 4.0)
     middleman-blog (4.0.1)
       addressable (~> 2.3)
       middleman-core (>= 4.0.0)
       tzinfo (>= 0.3.0)
-    middleman-cli (4.1.10)
+    middleman-cli (4.2.1)
       thor (>= 0.17.0, < 2.0)
     middleman-compass (4.0.1)
       compass (>= 1.0.0, < 2.0.0)
       middleman-core (>= 4.0.0)
-    middleman-core (4.1.10)
-      activesupport (~> 4.2)
+    middleman-core (4.2.1)
+      activesupport (>= 4.2, < 5.1)
       addressable (~> 2.3)
       backports (~> 3.6)
       bundler (~> 1.1)
@@ -117,10 +115,10 @@ GEM
       memoist (~> 0.14)
       padrino-helpers (~> 0.13.0)
       parallel
-      rack (>= 1.4.5, < 2.0)
+      rack (>= 1.4.5, < 3)
       sass (>= 3.4)
       servolux
-      tilt (~> 1.4.1)
+      tilt (~> 2.0)
       uglifier (~> 3.0)
     middleman-livereload (3.4.6)
       em-websocket (~> 0.5.1)
@@ -140,7 +138,7 @@ GEM
       middleman-core (>= 3.2)
       rouge (~> 2.0)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.10.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     mustache (1.0.3)
@@ -150,13 +148,13 @@ GEM
       mini_portile2 (~> 2.1.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    padrino-helpers (0.13.2)
+    padrino-helpers (0.13.3.3)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.2)
+      padrino-support (= 0.13.3.3)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.13.2)
+    padrino-support (0.13.3.3)
       activesupport (>= 3.1)
-    parallel (1.9.0)
+    parallel (1.11.2)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -168,12 +166,12 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (1.6.4)
+    rack (2.0.3)
     rack-livereload (0.3.16)
       rack
-    rake (11.2.2)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rdiscount (2.2.0.1)
     ref (2.0.0)
@@ -182,21 +180,21 @@ GEM
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
     rouge (2.0.7)
-    sass (3.4.22)
+    sass (3.4.24)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    servolux (0.12.0)
+    servolux (0.13.0)
     slop (3.6.0)
-    sprockets (3.6.3)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
     travis (1.8.2)
       backports
       faraday (~> 0.9)
@@ -208,9 +206,9 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     websocket (1.2.3)
 
@@ -220,9 +218,10 @@ PLATFORMS
 DEPENDENCIES
   bootstrap-sass
   builder
+  haml (~> 4.0.7)
   jquery-middleman
   kramdown
-  middleman (~> 4.1)
+  middleman (~> 4.2)
   middleman-blog
   middleman-compass
   middleman-livereload
@@ -240,7 +239,7 @@ DEPENDENCIES
   travis
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.4.1p111
 
 BUNDLED WITH
-   1.14.6
+   1.15.0