From 949159cae4c73f59f125c808b40f44b74c7e83a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 03:21:13 +0000 Subject: [PATCH 1/2] Bump the minor-and-patch group in /gem with 5 updates Bumps the minor-and-patch group in /gem with 5 updates: | Package | From | To | | --- | --- | --- | | [minitest](https://github.com/minitest/minitest) | `5.25.1` | `5.25.2` | | [json-schema](https://github.com/voxpupuli/json-schema) | `5.0.1` | `5.1.0` | | [rubocop](https://github.com/rubocop/rubocop) | `1.68.0` | `1.69.0` | | [sorbet-static-and-runtime](https://github.com/sorbet/sorbet) | `0.5.11630` | `0.5.11670` | | [tapioca](https://github.com/Shopify/tapioca) | `0.16.3` | `0.16.5` | Updates `minitest` from 5.25.1 to 5.25.2 - [Changelog](https://github.com/minitest/minitest/blob/master/History.rdoc) - [Commits](https://github.com/minitest/minitest/compare/v5.25.1...v5.25.2) Updates `json-schema` from 5.0.1 to 5.1.0 - [Changelog](https://github.com/voxpupuli/json-schema/blob/master/CHANGELOG.md) - [Commits](https://github.com/voxpupuli/json-schema/compare/v5.0.1...v5.1.0) Updates `rubocop` from 1.68.0 to 1.69.0 - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.68.0...v1.69.0) Updates `sorbet-static-and-runtime` from 0.5.11630 to 0.5.11670 - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) Updates `tapioca` from 0.16.3 to 0.16.5 - [Release notes](https://github.com/Shopify/tapioca/releases) - [Commits](https://github.com/Shopify/tapioca/compare/v0.16.3...v0.16.5) --- updated-dependencies: - dependency-name: minitest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: json-schema dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: rubocop dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: sorbet-static-and-runtime dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: tapioca dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch ... Signed-off-by: dependabot[bot] --- gem/Gemfile.lock | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/gem/Gemfile.lock b/gem/Gemfile.lock index 3581f845..0daa4c12 100644 --- a/gem/Gemfile.lock +++ b/gem/Gemfile.lock @@ -30,11 +30,11 @@ GEM irb (1.12.0) rdoc reline (>= 0.4.2) - json (2.7.5) - json-schema (5.0.1) + json (2.8.2) + json-schema (5.1.0) addressable (~> 2.8) language_server-protocol (3.17.0.3) - minitest (5.25.1) + minitest (5.25.2) minitest-reporters (1.7.1) ansi builder @@ -42,7 +42,7 @@ GEM ruby-progressbar netrc (0.11.0) parallel (1.26.3) - parser (3.3.5.1) + parser (3.3.6.0) ast (~> 2.4.1) racc prism (1.2.0) @@ -57,41 +57,41 @@ GEM sorbet-runtime (>= 0.5.9204) rdoc (6.6.3.1) psych (>= 4.0.0) - regexp_parser (2.9.2) + regexp_parser (2.9.3) reline (0.5.0) io-console (~> 0.5) - rubocop (1.68.0) + rubocop (1.69.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) + rubocop-ast (>= 1.36.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.33.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.36.2) parser (>= 3.3.1.0) rubocop-shopify (2.15.1) rubocop (~> 1.51) rubocop-sorbet (0.8.7) rubocop (>= 1) ruby-progressbar (1.13.0) - sorbet (0.5.11630) - sorbet-static (= 0.5.11630) - sorbet-runtime (0.5.11630) - sorbet-static (0.5.11630-universal-darwin) - sorbet-static (0.5.11630-x86_64-linux) - sorbet-static-and-runtime (0.5.11630) - sorbet (= 0.5.11630) - sorbet-runtime (= 0.5.11630) + sorbet (0.5.11670) + sorbet-static (= 0.5.11670) + sorbet-runtime (0.5.11670) + sorbet-static (0.5.11670-universal-darwin) + sorbet-static (0.5.11670-x86_64-linux) + sorbet-static-and-runtime (0.5.11670) + sorbet (= 0.5.11670) + sorbet-runtime (= 0.5.11670) spoom (1.5.0) erubi (>= 1.10.0) prism (>= 0.28.0) sorbet-static-and-runtime (>= 0.5.10187) thor (>= 0.19.2) stringio (3.1.0) - tapioca (0.16.3) + tapioca (0.16.5) bundler (>= 2.2.25) netrc (>= 0.11.0) parallel (>= 1.21.0) @@ -101,7 +101,9 @@ GEM thor (>= 1.2.0) yard-sorbet thor (1.3.2) - unicode-display_width (2.6.0) + unicode-display_width (3.1.2) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) yard (0.9.37) yard-sorbet (0.9.0) sorbet-runtime From 5908c3190d13a2a2912034cb2516d7dee4dfacac Mon Sep 17 00:00:00 2001 From: Andy Waite <13400+andyw8@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:44:24 -0500 Subject: [PATCH 2/2] Update JSON formatting in tests --- gem/test/rbi-central/cli/check_index_test.rb | 19 +++++++++---------- gem/test/rbi-central/cli/check_test.rb | 9 +++------ gem/test/rbi-central/index_test.rb | 3 +-- gem/test/rbi-central/repo_test.rb | 6 ++---- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/gem/test/rbi-central/cli/check_index_test.rb b/gem/test/rbi-central/cli/check_index_test.rb index cd080e1e..5bedcf5a 100644 --- a/gem/test/rbi-central/cli/check_index_test.rb +++ b/gem/test/rbi-central/cli/check_index_test.rb @@ -9,8 +9,7 @@ class CheckIndexTest < TestWithRepo def test_index_valid @repo.write_index!(<<~JSON) { - "gem1": { - } + "gem1": {} } JSON @repo.write_annotations_file!("gem1", "") @@ -66,15 +65,15 @@ def test_index_with_other_errors Error: Formatting errors found in `index.json`: --- expected +++ index.json - @@ -1,8 +1,7 @@ + @@ -1,5 +1,7 @@ { - "gem1": { - }, - - "gem2": { - - }, - + "gem2": {}, - "gem3": { - } + - "gem1": {}, + + "gem1": { + + }, + "gem2": {}, + - "gem3": {} + + "gem3": { + + } } Some checks failed. See above for details. diff --git a/gem/test/rbi-central/cli/check_test.rb b/gem/test/rbi-central/cli/check_test.rb index ab805665..6e7c3cd5 100644 --- a/gem/test/rbi-central/cli/check_test.rb +++ b/gem/test/rbi-central/cli/check_test.rb @@ -206,10 +206,8 @@ def test_check_index_modified @repo.git_commit! @repo.write_index!(<<~JSON) { - "gem1": { - }, - "gem2": { - } + "gem1": {}, + "gem2": {} } JSON res = @repo.repo("check --no-rubocop --no-runtime --no-static") @@ -238,8 +236,7 @@ def test_check_index_modified ERR refute(res.status) @repo.write_index!(<<~JSON) - { - } + {} JSON res = @repo.repo("check --no-rubocop --no-runtime --no-static") assert_equal(<<~ERR, RBICentral.filter_parser_warning(T.must(res.err))) diff --git a/gem/test/rbi-central/index_test.rb b/gem/test/rbi-central/index_test.rb index 417e439a..2719118a 100644 --- a/gem/test/rbi-central/index_test.rb +++ b/gem/test/rbi-central/index_test.rb @@ -85,8 +85,7 @@ def test_to_formatted_json }) assert_equal(<<~JSON, index.to_formatted_json) { - "gem1": { - }, + "gem1": {}, "gem2": { "dependencies": [ "a", diff --git a/gem/test/rbi-central/repo_test.rb b/gem/test/rbi-central/repo_test.rb index 39bbb41d..53ee498a 100644 --- a/gem/test/rbi-central/repo_test.rb +++ b/gem/test/rbi-central/repo_test.rb @@ -85,11 +85,9 @@ def test_check_index_format Formatting errors found in `index.json`: --- expected +++ index.json - @@ -1,13 +1,7 @@ + @@ -1,12 +1,7 @@ { - - "gem1": { - - }, - + "gem1": {}, + "gem1": {}, "gem2": { - "dependencies": [ - "a",