Revert "Revert "Bump middleman + html5-boilerplate dependency to stable 3.x releases""

This reverts commit f4a8c8b.

Brought to you, by: Middleman

Author: bascht

Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'rake',              '~> 10.0.3'
-gem 'sass',              '~> 3.2.5'
+gem 'sass',              '~> 3.4.0'
 gem 'jquery-middleman', require: false
 gem 'zurb-foundation',   '~> 4.3.2', require: false
-gem 'middleman',         '~> 3.2.0'
+gem 'middleman',         '~> 3.4.1'
 gem 'middleman-deploy',  '~> 1.0'
 gem 'builder'
 gem 'sitemap_generator'
@@ -14,9 +14,7 @@ gem 'redcarpet'
 gem 'pygments.rb'
 
 
-gem 'html5-boilerplate', :require => 'html5-boilerplate',
-                         :git     => 'https://github.com/edenspiekermann/compass-html5-boilerplate.git',
-                         :branch  => 'padrino'
+gem 'html5-boilerplate', :require => 'html5-boilerplate'
 
 group :production do
   gem 'puma',         '~> 1.6.3'

Gemfile.lock

@@ -1,80 +1,107 @@
-GIT
-  remote: https://github.com/edenspiekermann/compass-html5-boilerplate.git
-  revision: e415a36afe3d5240a46d48d0c7529b92b54d09bf
-  branch: padrino
-  specs:
-    html5-boilerplate (1.0.0)
-      compass (>= 0.11.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     builder (3.2.3)
+    capybara (2.4.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     chunky_png (1.3.10)
-    coffee-script (2.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    compass (0.12.7)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    execjs (1.4.1)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
       multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-h5bp (1.0.0)
+      compass (~> 1.0, >= 1.0.3)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    erubis (2.7.0)
+    execjs (2.7.0)
     ffi (1.9.21)
-    fssm (0.2.10)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
     hike (1.2.3)
-    i18n (0.6.11)
+    hooks (0.4.1)
+      uber (~> 0.0.14)
+    html5-boilerplate (2.1.0)
+      compass
+      compass-h5bp
+    i18n (0.7.0)
     icalendar (2.4.1)
     jquery-middleman (3.1.2)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
     kramdown (1.16.2)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    middleman (3.2.2)
-      coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    middleman (3.4.1)
+      coffee-script (~> 2.2)
+      compass (>= 1.0.0, < 2.0.0)
+      compass-import-once (= 1.0.5)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.2.2)
+      middleman-core (= 3.4.1)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.4.0)
-    middleman-core (3.2.2)
-      activesupport (~> 3.2.6)
+      sass (>= 3.4.0, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.4.1)
+      activesupport (~> 4.1)
       bundler (~> 1.1)
-      i18n (~> 0.6.9)
-      listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      capybara (~> 2.4.4)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.7.0)
+      listen (~> 3.0.3)
+      padrino-helpers (~> 0.12.3)
+      rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1)
+      tilt (~> 1.4.1, < 2.0)
     middleman-deploy (1.0.0)
       middleman-core (>= 3.2)
       net-sftp
       ptools
-    middleman-sprockets (3.3.3)
-      middleman-core (>= 3.2)
-      sprockets (~> 2.2)
+    middleman-sprockets (3.5.0)
+      middleman-core (>= 3.3)
+      sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.1.0)
+      sprockets-sass (~> 1.3.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
+    minitest (5.11.3)
     multi_json (1.13.1)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
+    padrino-helpers (0.12.8.1)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.8.1)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.8.1)
+      activesupport (>= 3.1)
     ptools (1.3.5)
     puma (1.6.3)
       rack (~> 1.2)
@@ -84,16 +111,14 @@ GEM
     rack-contrib (1.8.0)
       rack (~> 1.4)
     rack-rewrite (1.5.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
     rake (10.0.4)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rb-kqueue (0.2.5)
-      ffi (>= 0.5.0)
     redcarpet (3.4.0)
-    sass (3.2.19)
+    sass (3.4.25)
     sitemap_generator (6.0.1)
       builder (~> 3.0)
     sprockets (2.12.4)
@@ -103,15 +128,21 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.1.0)
+    sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     temple (0.8.0)
     thor (0.20.0)
+    thread_safe (0.3.6)
     tilt (1.4.1)
-    uglifier (2.4.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uber (0.0.15)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
     zurb-foundation (4.3.2)
       sass (>= 3.2.0)
 
@@ -121,10 +152,10 @@ PLATFORMS
 DEPENDENCIES
   builder
   coffee-script
-  html5-boilerplate!
+  html5-boilerplate
   icalendar
   jquery-middleman
-  middleman (~> 3.2.0)
+  middleman (~> 3.4.1)
   middleman-deploy (~> 1.0)
   nokogiri
   puma (~> 1.6.3)
@@ -134,7 +165,7 @@ DEPENDENCIES
   rake (~> 10.0.3)
   rb-inotify (~> 0.9)
   redcarpet
-  sass (~> 3.2.5)
+  sass (~> 3.4.0)
   sitemap_generator
   zurb-foundation (~> 4.3.2)