ruby.git/lib/bundler/resolver/package.rb, branch v3_4_9 The Ruby Programming Language Merge RubyGems-3.6.4 and Bundler-2.6.4 2025-02-21T00:50:20+00:00 Hiroshi SHIBATA hsbt@ruby-lang.org 2025-02-21T00:27:47+00:00 a0025b6e5d440139ebc16a555cddb4dc9dd45449 






Merge RubyGems-3.6.3 and Bundler-2.6.3
2025-02-21T00:50:20+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2025-02-21T00:27:17+00:00

19c69f382baa13cac3bf36b861067bdc424e1be1












[rubygems/rubygems] Fix `--prefer-local` flag
2024-08-22T11:48:32+00:00

David Rodríguez
deivid.rodriguez@riseup.net

2024-08-19T19:53:13+00:00

2569413b1cb9765d0e31fc8dcf0e674d428bb4e7

The original implementation of this flag was too naive and all it did
was restricting gems to locally installed versions if there are any
local versions installed.

However, it should be much smarter. For example:

* It should fallback to remote versions if locally installed version
  don't satisfy the requirements.
* It should pick locally installed versions even for subdependencies not
  yet discovered.

This commit fixes both issues by using a smarter approach similar to how
we resolve prereleases:

* First resolve optimistically using only locally installed gems.
* If any conflicts are found, scan those conflicts, allow remote
  versions for the specific gems that run into conflicts, and
  re-resolve.

https://github.com/rubygems/rubygems/commit/607a3bf479

Co-authored-by: Gourav Khunger <gouravkhunger18@gmail.com>





The original implementation of this flag was too naive and all it did
was restricting gems to locally installed versions if there are any
local versions installed.

However, it should be much smarter. For example:

* It should fallback to remote versions if locally installed version
  don't satisfy the requirements.
* It should pick locally installed versions even for subdependencies not
  yet discovered.

This commit fixes both issues by using a smarter approach similar to how
we resolve prereleases:

* First resolve optimistically using only locally installed gems.
* If any conflicts are found, scan those conflicts, allow remote
  versions for the specific gems that run into conflicts, and
  re-resolve.

https://github.com/rubygems/rubygems/commit/607a3bf479

Co-authored-by: Gourav Khunger <gouravkhunger18@gmail.com>







[rubygems/rubygems] Fix generic platform gems getting incorrectly removed when locked for a specific platform
2024-07-09T16:34:09+00:00

David Rodríguez
deivid.rodriguez@riseup.net

2024-07-04T16:22:03+00:00

140d8318dbafe2c7c112651389da0b3ef4fd8424

If they are already in the lockfile as the most specific variant for a
platform, we shouldn't change that unless explicitly unlocking.

https://github.com/rubygems/rubygems/commit/a901660498





If they are already in the lockfile as the most specific variant for a
platform, we shouldn't change that unless explicitly unlocking.

https://github.com/rubygems/rubygems/commit/a901660498







[rubygems/rubygems] Raise an error when top level dependency does not resolve under all locked platforms
2023-10-16T04:52:57+00:00

David Rodríguez
deivid.rodriguez@riseup.net

2023-10-04T18:08:49+00:00

77ffa1a7c3af797078b2a8e84bfc6f2b0ba67820

https://github.com/rubygems/rubygems/commit/25304f3e8d





https://github.com/rubygems/rubygems/commit/25304f3e8d







Merge RubyGems/Bundler master.
2023-01-31T01:49:08+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2023-01-31T00:35:54+00:00

d3822c9a8aa91151bd040d5635b723ff80bc1886

  Pick from https://github.com/rubygems/rubygems/commit/5ace20dbecfeaf09fba5f616193f3cfcff70ba00





  Pick from https://github.com/rubygems/rubygems/commit/5ace20dbecfeaf09fba5f616193f3cfcff70ba00







Merge RubyGems/Bundler master
2022-12-09T07:36:22+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2022-12-09T05:45:51+00:00

a4e14b9d9d58391fb7d7a10be8d883690860373b

  Pick from https://github.com/rubygems/rubygems/commit/823c776d951f3c35094611473ec77f94e8bf6610





  Pick from https://github.com/rubygems/rubygems/commit/823c776d951f3c35094611473ec77f94e8bf6610







Migrate our resolver engine to PubGrub
2022-11-11T22:40:31+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2022-11-11T21:00:58+00:00

0a9d51ee9d2b3d0111832e5ea1c8195a16e2f99b

  https://github.com/rubygems/rubygems/pull/5960

  Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>





  https://github.com/rubygems/rubygems/pull/5960

  Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>