From bf2f1ebbec3e72727c9c56a6768ad87b253b8b85 Mon Sep 17 00:00:00 2001 From: Shaun VanWeelden Date: Thu, 8 Apr 2021 14:06:38 -0500 Subject: [PATCH] Make slate compatible with ruby 3.0.0 (#1424) --- .github/workflows/build.yml | 2 +- Gemfile | 5 +- Gemfile.lock | 111 ++++++++++++++++++++---------------- 3 files changed, 66 insertions(+), 52 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 434c8d0..f705b7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - ruby-version: [2.5, 2.6, 2.7] + ruby-version: [2.5, 2.6, 2.7, 3.0] steps: - uses: actions/checkout@v2 diff --git a/Gemfile b/Gemfile index a10cfaf..3897dff 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ -ruby '~> 2.5' +ruby '>= 2.5' source 'https://rubygems.org' # Middleman -gem 'middleman', '~>4.3' +gem 'middleman', :github => 'middleman/middleman', :branch => '4.x' gem 'middleman-syntax', '~> 3.2' gem 'middleman-autoprefixer', '~> 2.7' gem 'middleman-sprockets', '~> 4.1' @@ -10,3 +10,4 @@ gem 'rouge', '~> 3.21' gem 'redcarpet', '~> 3.5.0' gem 'nokogiri', '~> 1.11.0' gem 'sass' +gem 'webrick' diff --git a/Gemfile.lock b/Gemfile.lock index 254c1ad..f247941 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,58 +1,21 @@ -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/middleman/middleman.git + revision: 0c950d82f6f4f540e8572195f80c9a9fb15ab80c + branch: 4.x specs: - activesupport (5.2.4.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - autoprefixer-rails (9.5.1.1) - execjs - backports (3.18.2) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) - contracts (0.13.0) - dotenv (2.7.6) - erubis (2.7.0) - execjs (2.7.0) - fast_blank (1.0.0) - fastimage (2.2.0) - ffi (1.13.1) - haml (5.1.2) - temple (>= 0.8.0) - tilt - hamster (3.0.0) - concurrent-ruby (~> 1.0) - hashie (3.6.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - kramdown (2.3.1) - rexml - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - memoist (0.16.2) 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-autoprefixer (2.10.1) - autoprefixer-rails (~> 9.1) - middleman-core (>= 3.3.3) middleman-cli (4.3.11) thor (>= 0.17.0, < 2.0) middleman-core (4.3.11) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) backports (~> 3.6) - bundler + bundler (~> 2.0) contracts (~> 0.13.0) dotenv erubis @@ -70,7 +33,52 @@ GEM sassc (~> 2.0) servolux tilt (~> 2.0.9) + toml uglifier (~> 3.0) + webrick + +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.2.5) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + autoprefixer-rails (9.5.1.1) + execjs + backports (3.21.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.1.7) + contracts (0.13.0) + dotenv (2.7.6) + erubis (2.7.0) + execjs (2.7.0) + fast_blank (1.0.0) + fastimage (2.2.3) + ffi (1.13.1) + haml (5.2.1) + temple (>= 0.8.0) + tilt + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + kramdown (2.3.1) + rexml + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + memoist (0.16.2) + middleman-autoprefixer (2.10.1) + autoprefixer-rails (~> 9.1) + middleman-core (>= 3.3.3) middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) @@ -78,7 +86,7 @@ GEM middleman-core (>= 3.2) rouge (~> 3.2) mini_portile2 (2.5.0) - minitest (5.14.2) + minitest (5.14.4) nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -88,7 +96,8 @@ GEM tilt (>= 1.4.1, < 3) padrino-support (0.13.3.4) activesupport (>= 3.1) - parallel (1.19.2) + parallel (1.20.1) + parslet (1.8.2) public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) @@ -96,7 +105,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.1) - rexml (3.2.4) + rexml (3.2.5) rouge (3.26.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -110,19 +119,22 @@ GEM concurrent-ruby (~> 1.0) rack (> 1, < 3) temple (0.8.2) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.7) + toml (0.2.0) + parslet (~> 1.8.0) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) + webrick (1.7.0) PLATFORMS ruby DEPENDENCIES - middleman (~> 4.3) + middleman! middleman-autoprefixer (~> 2.7) middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) @@ -130,9 +142,10 @@ DEPENDENCIES redcarpet (~> 3.5.0) rouge (~> 3.21) sass + webrick RUBY VERSION ruby 2.7.2p137 BUNDLED WITH - 2.1.4 + 2.2.15