From 1c07f72839b6b9e2e8303e084c3954aab3553fdc Mon Sep 17 00:00:00 2001 From: Alexey Vasiliev Date: Sun, 30 Jan 2022 21:59:41 +0200 Subject: [PATCH] Update middleman-core gemspec deps (allow activesupport 7 and ruby 3.1 usage) (#2517) * Update middleman-core gemspec deps (allow activesupport 7 usage) * update lock file * fix yaml loading * fix dump for yaml * update bundler for ruby 3.1 * Array, Hash allowed in safe_load + use CLOCK_MONOTONIC * Update test deps * back contracts 0.16.0 * update mini_racer * fix corrupted cache * lock contracts gem (patch version break middleman) * add x86_64-linux platform to lock * add x86_64-linux and x86_64-darwin-20 platforms to lock * revert fix corrupted cache * disable check 3.1 - nokogiri issue * Support ruby 3.0.0 (commented some contracts) * Fix rubocop * no success for 3.1 - mini_racer build error on CI * be more specific about padrino-helpers * trying to back 3.1 * try to disable platform fetch * disable js runtime * trying to fix https://github.com/simplecov-ruby/simplecov/issues/1003 * `Trying to back min_racer * No success with min_racer * remove comments, move in correct place openssl Co-authored-by: Thomas Reynolds --- Gemfile.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff006c9d..02c727de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,13 +146,13 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_mime (1.1.2) + mini_portile2 (2.7.1) minitest (5.15.0) multi_test (0.1.2) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - nokogiri (1.13.1-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.13.1-x86_64-linux) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) oj (3.13.11) padrino-helpers (0.15.1) @@ -261,8 +261,7 @@ GEM webrick (~> 1.7.0) PLATFORMS - x86_64-darwin-19 - x86_64-linux + ruby DEPENDENCIES addressable (~> 2.8) @@ -292,4 +291,4 @@ DEPENDENCIES yard (~> 0.9.27) BUNDLED WITH - 2.3.3 + 2.3.4