From 52d95e8f83fc36b7bb0674b576cbd5eaf62a5e8d Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Wed, 17 Sep 2025 20:15:56 +0200 Subject: [PATCH] Jekyll 4.4 Add bigdecimal dependency to avoid warning with Ruby 3.3 and update problems to Ruby 3.4. Point to CONTRIBUTING from README instead of repeating the instructions. --- CONTRIBUTING.md | 4 ++-- Gemfile | 4 +++- Gemfile.lock | 39 ++++++++++++++++++++++++--------------- README.md | 15 +-------------- 4 files changed, 30 insertions(+), 32 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b143301d9..09a17d880b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ ## Building the site The registry site uses [jekyll](https://jekyllrb.com/), -a Ruby based static site generator, with the Dinky theme. +a Ruby based static site generator, with [Just the Docs](https://github.com/just-the-docs/just-the-docs). ### Docker dev @@ -26,7 +26,7 @@ bundle install With all the gems (dependencies) installed, you can launch the jekyll server. ``` bash -bundle exec jekyll serve +bundle exec jekyll serve --livereload ``` It will show output like this, and you can grab the Server address diff --git a/Gemfile b/Gemfile index f6519b3588..74f548b622 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "jekyll", "~> 4.2" +gem "jekyll", "~> 4.4" gem "webrick", "~> 1.7" gem "jekyll-remote-theme" gem "jekyll-include-cache", "~>0.2.1" @@ -11,3 +11,5 @@ gem "just-the-docs", "~> 0.4.2" group :jekyll_plugins do gem "jekyll-sitemap", "~> 1.4" end + +gem "bigdecimal", "~> 3.2" diff --git a/Gemfile.lock b/Gemfile.lock index a240ddfe1f..2afb3575d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,30 +3,37 @@ GEM specs: addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) + base64 (0.3.0) + bigdecimal (3.2.3) colorator (1.1.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.5) + csv (3.3.5) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.5) + ffi (1.17.2) + ffi (1.17.2-x64-mingw-ucrt) forwardable-extended (2.6.0) - google-protobuf (3.22.2) - google-protobuf (3.22.2-x64-mingw-ucrt) + google-protobuf (3.25.8) + google-protobuf (3.25.8-x64-mingw-ucrt) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (4.3.2) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) i18n (~> 1.0) jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) + json (~> 2.6) kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (>= 0.3.6, < 0.5) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) @@ -47,16 +54,17 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) + json (2.13.2) just-the-docs (0.4.2) jekyll (>= 3.8.5) jekyll-seo-tag (>= 2.0) rake (>= 12.3.1) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) @@ -65,10 +73,10 @@ GEM public_suffix (5.0.1) rake (13.0.6) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.30.0) + rexml (3.4.4) + rouge (4.6.0) rubyzip (2.3.2) safe_yaml (1.0.5) sass-embedded (1.58.3) @@ -78,7 +86,7 @@ GEM google-protobuf (~> 3.21) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.4.2) + unicode-display_width (2.6.0) webrick (1.8.1) PLATFORMS @@ -86,7 +94,8 @@ PLATFORMS x64-mingw-ucrt DEPENDENCIES - jekyll (~> 4.2) + bigdecimal (~> 3.2) + jekyll (~> 4.4) jekyll-include-cache (~> 0.2.1) jekyll-remote-theme jekyll-sitemap (~> 1.4) diff --git a/README.md b/README.md index b73d57f9fe..df01ddee12 100644 --- a/README.md +++ b/README.md @@ -15,17 +15,4 @@ This site contains the OpenAPI Initiative Registry and content for the HTML vers ## Development -> [!NOTE] -> As of 2024-08-28 Jekyll version 4.3.2 does _not_ work with Ruby 3.3.x. -> -> Make sure you have Ruby 3.2.x or lower installed. - -Install [jekyll](https://jekyllrb.com/docs/installation/) for your platform, install the site -~~~sh -bundle install -~~~ -run it -~~~sh -bundle exec jekyll serve --livereload -~~~ -and change it to your heart's content :sunglasses: +Please follow the instructions in the [Contributing Guide](./CONTRIBUTING.md).