diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b63bc7c..48ef0efe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ubuntu, macos] - ruby-version: ['3.1', '3.0'] + ruby-version: ['3.1'] steps: - uses: actions/checkout@v2 - name: Set up Ruby diff --git a/CHANGELOG.md b/CHANGELOG.md index e4ca26bf..2d5ef0c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # master +- Require Ruby 3.1+ - Support TOML as frontmatter and data. - Handle the removal of a file in dependencies. Fixes #2292 - Update rubocop + use enable-frozen-string-literal (#2354) diff --git a/Gemfile.lock b/Gemfile.lock index e39cfc02..04ee03a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,7 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (7.0.0) + activesupport (7.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -51,9 +51,9 @@ GEM rspec-expectations (~> 3.4) thor (~> 1.0) ast (2.4.2) - async (1.30.1) + async (2.0.0) console (~> 1.10) - nio4r (~> 2.3) + io-event (~> 1.0.0) timers (~> 4.1) async-dns (1.3.0) async-io (~> 1.15) @@ -95,10 +95,10 @@ GEM mime-types (~> 3.3, >= 3.3.1) multi_test (~> 0.1, >= 0.1.2) sys-uname (~> 1.2, >= 1.2.2) - cucumber-core (10.1.0) + cucumber-core (10.1.1) cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-messages (~> 17.1, >= 17.1.1) - cucumber-tag-expressions (~> 4.0, >= 4.0.2) + cucumber-tag-expressions (~> 4.1, >= 4.1.0) cucumber-create-meta (6.0.4) cucumber-messages (~> 17.1, >= 17.1.1) sys-uname (~> 1.2, >= 1.2.2) @@ -109,10 +109,9 @@ GEM cucumber-messages (~> 17.1, >= 17.1.0) cucumber-messages (17.1.1) cucumber-tag-expressions (4.1.0) - cucumber-wire (6.2.0) + cucumber-wire (6.2.1) cucumber-core (~> 10.1, >= 10.1.0) cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) - cucumber-messages (~> 17.1, >= 17.1.1) debug_inspector (1.1.0) diff-lcs (1.5.0) docile (1.4.0) @@ -120,7 +119,7 @@ GEM erubis (2.7.0) execjs (2.8.1) fastimage (2.2.6) - ffi (1.15.4) + ffi (1.15.5) fiber-local (1.0.0) generator (0.0.1) haml (5.2.2) @@ -129,14 +128,15 @@ GEM hamster (3.0.0) concurrent-ruby (~> 1.0) hashie (5.0.0) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) interception (0.5) + io-event (1.0.2) kramdown (2.3.1) rexml lazy_priority_queue (0.1.1) liquid (5.1.0) - listen (3.7.0) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) matrix (0.4.2) @@ -144,18 +144,17 @@ GEM method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) + mime-types-data (3.2022.0105) mini_mime (1.1.2) - mini_portile2 (2.6.1) + mini_portile2 (2.7.1) minitest (5.15.0) multi_test (0.1.2) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) - oj (3.13.10) + oj (3.13.11) padrino-helpers (0.15.1) i18n (>= 0.6.7, < 2) padrino-support (= 0.15.1) @@ -181,7 +180,7 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) @@ -196,18 +195,18 @@ GEM rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-support (3.10.2) - rubocop (1.24.1) + rspec-support (3.10.3) + rubocop (1.25.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml @@ -216,7 +215,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.15.1) parser (>= 3.0.1.1) - rubocop-performance (1.13.1) + rubocop-performance (1.13.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.11.0) @@ -245,7 +244,7 @@ GEM sys-uname (1.2.2) ffi (~> 1.1) temple (0.8.2) - thor (1.1.0) + thor (1.2.1) tilt (2.0.10) timers (4.3.3) toml (0.3.0) diff --git a/middleman-cli/middleman-cli.gemspec b/middleman-cli/middleman-cli.gemspec index 7991836e..445a1ed8 100644 --- a/middleman-cli/middleman-cli.gemspec +++ b/middleman-cli/middleman-cli.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(fixtures|features|spec)/}) } s.executable = 'middleman' s.require_path = 'lib' - s.required_ruby_version = '>= 3.0.0' + s.required_ruby_version = '>= 3.1.0' # CLI s.add_dependency('thor', ['>= 0.17.0', '< 2.0']) diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index dcfa8d8f..16e1e020 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(fixtures|features|spec)/}) } s.require_path = 'lib' - s.required_ruby_version = '>= 3.0.0' + s.required_ruby_version = '>= 3.1.0' # Core s.add_dependency('bundler') diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec index 03a04086..dd7708e2 100644 --- a/middleman/middleman.gemspec +++ b/middleman/middleman.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = `git ls-files -z`.split("\0") s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0") s.require_path = 'lib' - s.required_ruby_version = '>= 3.0.0' + s.required_ruby_version = '>= 3.1.0' s.add_dependency('middleman-core', Middleman::VERSION) s.add_dependency('middleman-cli', Middleman::VERSION)