From 9ff4200943d4b99b9934238d5508e0032a293f6b Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 17 Jun 2021 20:08:35 -0400 Subject: [PATCH] Bump middleman from d180ca3 to 4.4.0 (#1474) --- Gemfile | 2 +- Gemfile.lock | 110 ++++++++++++++++++++++++--------------------------- 2 files changed, 52 insertions(+), 60 deletions(-) diff --git a/Gemfile b/Gemfile index 9ececa0..7c4f79c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ ruby '>= 2.5' source 'https://rubygems.org' # Middleman -gem 'middleman', :github => 'middleman/middleman', :branch => '4.x' +gem 'middleman', '~> 4.4' gem 'middleman-syntax', '~> 3.2' gem 'middleman-autoprefixer', '~> 3.0' gem 'middleman-sprockets', '~> 4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 3f76a4e..21eb170 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,51 +1,12 @@ -GIT - remote: https://github.com/middleman/middleman.git - revision: d180ca337202873f2601310c74ba2b6b4cf063ec - branch: 4.x - specs: - middleman (4.3.11) - coffee-script (~> 2.2) - haml (>= 4.0.5) - kramdown (>= 2.3.0) - middleman-cli (= 4.3.11) - middleman-core (= 4.3.11) - middleman-cli (4.3.11) - thor (>= 0.17.0, < 2.0) - middleman-core (4.3.11) - activesupport (>= 4.2, < 6.1) - addressable (~> 2.3) - backports (~> 3.6) - bundler (~> 2.0) - contracts (~> 0.13.0) - dotenv - erubis - execjs (~> 2.0) - fast_blank - fastimage (~> 2.0) - hamster (~> 3.0) - hashie (~> 3.4) - i18n (~> 0.9.0) - listen (~> 3.0.0) - memoist (~> 0.14) - padrino-helpers (~> 0.13.0) - parallel - rack (>= 1.4.5, < 3) - sassc (~> 2.0) - servolux - tilt (~> 2.0.9) - toml - uglifier (~> 3.0) - webrick - GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.7) + activesupport (6.1.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) autoprefixer-rails (10.2.5.0) @@ -61,7 +22,7 @@ GEM erubis (2.7.0) execjs (2.7.0) fast_blank (1.0.0) - fastimage (2.2.3) + fastimage (2.2.4) ffi (1.15.0) haml (5.2.1) temple (>= 0.8.0) @@ -69,7 +30,7 @@ GEM hamster (3.0.0) concurrent-ruby (~> 1.0) hashie (3.6.0) - i18n (0.9.5) + i18n (1.6.0) concurrent-ruby (~> 1.0) kramdown (2.3.1) rexml @@ -77,9 +38,42 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) memoist (0.16.2) + middleman (4.4.0) + coffee-script (~> 2.2) + haml (>= 4.0.5) + kramdown (>= 2.3.0) + middleman-cli (= 4.4.0) + middleman-core (= 4.4.0) middleman-autoprefixer (3.0.0) autoprefixer-rails (~> 10.0) middleman-core (>= 4.0.0) + middleman-cli (4.4.0) + thor (>= 0.17.0, < 2.0) + middleman-core (4.4.0) + activesupport (>= 6.1, < 7.0) + addressable (~> 2.4) + backports (~> 3.6) + bundler (~> 2.0) + contracts (~> 0.13.0) + dotenv + erubis + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) + i18n (~> 1.6.0) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.15.0) + parallel + rack (>= 1.4.5, < 3) + sassc (~> 2.0) + servolux + tilt (~> 2.0.9) + toml + uglifier (~> 3.0) + webrick middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) @@ -91,14 +85,13 @@ GEM nokogiri (1.11.6) mini_portile2 (~> 2.5.0) racc (~> 1.4) - padrino-helpers (0.13.3.4) - i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.13.3.4) + padrino-helpers (0.15.1) + i18n (>= 0.6.7, < 2) + padrino-support (= 0.15.1) tilt (>= 1.4.1, < 3) - padrino-support (0.13.3.4) - activesupport (>= 3.1) + padrino-support (0.15.1) parallel (1.20.1) - parslet (1.8.2) + parslet (2.0.0) public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) @@ -121,12 +114,11 @@ GEM rack (> 1, < 3) temple (0.8.2) thor (1.1.0) - thread_safe (0.3.6) tilt (2.0.10) - toml (0.2.0) - parslet (~> 1.8.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) webrick (1.7.0) @@ -136,7 +128,7 @@ PLATFORMS ruby DEPENDENCIES - middleman! + middleman (~> 4.4) middleman-autoprefixer (~> 3.0) middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) @@ -150,4 +142,4 @@ RUBY VERSION ruby 2.7.2p137 BUNDLED WITH - 2.2.15 + 2.2.20