From 245be6fde7f457065e285eaa8db7213ede94b4f6 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 18 Dec 2023 10:51:46 -0600 Subject: [PATCH 1/4] Build: update travis ruby version --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2714f5313..be94e6f53 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.4 +3.2.2 diff --git a/.travis.yml b/.travis.yml index 41677711e..15685e58c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: xenial language: ruby rvm: - - "2.6.4" + - "3.2.2" cache: bundler diff --git a/Gemfile b/Gemfile index de133667b..cc864dfdd 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ## If you update the version here, also update it in .travis.yml, .ruby-version, ## and README.md. Then push your branch and make sure Travis supports that ## version. -ruby '2.6.4' +ruby '3.2.2' ## If you add a new Gem below, run `bundle install` to install it. group :development do diff --git a/Gemfile.lock b/Gemfile.lock index c501d4ade..b9bc12e7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,4 +107,4 @@ DEPENDENCIES toml RUBY VERSION - ruby 2.6.4p104 + ruby 3.2.2 From 1ad09d4f041e7f81b4dcb814d4254a5c8421db26 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 18 Dec 2023 12:18:08 -0600 Subject: [PATCH 2/4] listen version update --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b9bc12e7c..d6420411d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,9 +51,9 @@ GEM addressable (>= 2.4) kramdown (1.17.0) liquid (4.0.0) - listen (3.1.1) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mdl (0.6.0) kramdown (~> 1.12, >= 1.12.0) mixlib-cli (~> 2.1, >= 2.1.1) From 505a0a4adddd0879c60d16a73f4ed88b5e9dd957 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 18 Dec 2023 12:23:25 -0600 Subject: [PATCH 3/4] need to explicity include rexml in ruby 3.x --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index cc864dfdd..217cdc56f 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ group :development do gem 'jekyll' gem "minima", "~> 2.0" ## Default Jekyll theme gem 'jekyll-redirect-from' + gem 'rexml', '~> 3.2.4' end group :testing do diff --git a/Gemfile.lock b/Gemfile.lock index d6420411d..9f7dc6c3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,6 +80,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) + rexml (3.2.6) rouge (3.1.1) safe_yaml (1.0.4) sass (3.5.6) @@ -104,6 +105,7 @@ DEPENDENCIES json-schema mdl minima (~> 2.0) + rexml (~> 3.2.4) toml RUBY VERSION From 06a8d654e37c0520afb05e5a4e84f69303696782 Mon Sep 17 00:00:00 2001 From: Mike Schmidt Date: Mon, 18 Dec 2023 12:35:35 -0600 Subject: [PATCH 4/4] yaml load function compatibility --- _contrib/schema-validator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_contrib/schema-validator.rb b/_contrib/schema-validator.rb index 51a6bbbf5..919ac742d 100755 --- a/_contrib/schema-validator.rb +++ b/_contrib/schema-validator.rb @@ -19,12 +19,12 @@ to_validate = ARGV[1] file = File.open(schema_file, 'r') -schema = YAML.load(file) +schema = YAML.load(file, aliases: true) file.close() file = File.open(to_validate, 'r') if to_validate.end_with?(".yaml") or to_validate.end_with?(".md") - document = YAML.load(file) + document = YAML.load(file, aliases: true) elsif to_validate.end_with?(".toml") document = TOML.load_file(file) else