diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-05-30 20:25:29 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-05-30 21:50:07 +0900 |
commit | 4bbeed61346d6016e2d72818e8068bedcb9f006d (patch) | |
tree | ddf1b23eb0e63a47efa8cc1fc0b72652e3dac354 /tool | |
parent | 30b960ba345fd462f98db204f47bba66819d9884 (diff) | |
download | ruby-4bbeed61346d6016e2d72818e8068bedcb9f006d.tar.gz |
Merge RubyGems/Bundler master from 4076391fce5847689bf2ec402b17133fe4e32285
Diffstat (limited to 'tool')
-rw-r--r-- | tool/bundler/dev_gems.rb | 3 | ||||
-rw-r--r-- | tool/bundler/dev_gems.rb.lock | 33 | ||||
-rw-r--r-- | tool/bundler/rubocop_gems.rb.lock | 6 | ||||
-rw-r--r-- | tool/bundler/standard_gems.rb.lock | 6 |
4 files changed, 29 insertions, 19 deletions
diff --git a/tool/bundler/dev_gems.rb b/tool/bundler/dev_gems.rb index ef63263414..856256a246 100644 --- a/tool/bundler/dev_gems.rb +++ b/tool/bundler/dev_gems.rb @@ -7,7 +7,8 @@ gem "rake", "~> 13.0" gem "rb_sys" gem "webrick", "~> 1.6" -gem "parallel_tests", "~> 2.29" +gem "turbo_tests", "~> 2.1" +gem "parallel_tests", "< 3.9.0" gem "parallel", "~> 1.19" gem "rspec-core", "~> 3.12" gem "rspec-expectations", "~> 3.12" diff --git a/tool/bundler/dev_gems.rb.lock b/tool/bundler/dev_gems.rb.lock index 43eb7c9960..c7c323ea54 100644 --- a/tool/bundler/dev_gems.rb.lock +++ b/tool/bundler/dev_gems.rb.lock @@ -5,34 +5,42 @@ GEM hpricot (0.8.6) hpricot (0.8.6-java) mustache (1.1.1) - parallel (1.22.1) - parallel_tests (2.32.0) + parallel (1.23.0) + parallel_tests (3.8.1) parallel - power_assert (2.0.2) + power_assert (2.0.3) rake (13.0.6) - rb_sys (0.9.63) + rb_sys (0.9.78) rdiscount (2.2.7) ronn (0.7.3) hpricot (>= 0.8.2) mustache (>= 0.7.0) rdiscount (>= 1.5.8) - rspec-core (3.12.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.1) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.0) - test-unit (3.5.5) + test-unit (3.5.9) power_assert - uri (0.12.0) - webrick (1.7.0) + turbo_tests (2.1.0) + bundler (>= 2.1) + parallel_tests (>= 3.3.0, < 5) + rspec (>= 3.10) + uri (0.12.1) + webrick (1.8.1) PLATFORMS + arm64-darwin-22 java - ruby universal-java-11 universal-java-18 x64-mingw-ucrt @@ -42,7 +50,7 @@ PLATFORMS DEPENDENCIES parallel (~> 1.19) - parallel_tests (~> 2.29) + parallel_tests (< 3.9.0) rake (~> 13.0) rb_sys ronn (~> 0.7.3) @@ -50,6 +58,7 @@ DEPENDENCIES rspec-expectations (~> 3.12) rspec-mocks (~> 3.12) test-unit (~> 3.0) + turbo_tests (~> 2.1) uri (~> 0.12.0) webrick (~> 1.6) diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock index 04d49cf0de..7f43e38dcb 100644 --- a/tool/bundler/rubocop_gems.rb.lock +++ b/tool/bundler/rubocop_gems.rb.lock @@ -21,12 +21,12 @@ GEM rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.1) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.0) diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock index 6cb9d7efd9..d0387b438c 100644 --- a/tool/bundler/standard_gems.rb.lock +++ b/tool/bundler/standard_gems.rb.lock @@ -22,12 +22,12 @@ GEM rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.1) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.0) |