Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak BOM support to accomodate scopes better #4154

Merged
merged 24 commits into from
Jan 21, 2025

Conversation

alexarchambault
Copy link
Collaborator

@alexarchambault alexarchambault commented Dec 17, 2024

The PR adds non-regression tests for BOM use in compileIvyDeps and runIvyDeps, and makes sure BOMs of a module can be used in its test modules.

This changes the way transitive dependencies, but also transitive BOM
dependencies and dependency management, are passed to coursier.

Before this commit, Mill was walking its own module graph, and
dependencies / BOM dependencies / dep management were manually aggregated
beforehand. During dependency resolution, coursier also does such
aggregations.

Having both Mill and coursier handle that concern could lead to discrepancies.
So this commit passes non-processed dependencies / BOM dependencies /
dep management as-is to coursier, and lets coursier handle / compose
those.
@alexarchambault

This comment was marked as outdated.

@alexarchambault

This comment was marked as outdated.

@alexarchambault

This comment was marked as outdated.

@alexarchambault alexarchambault marked this pull request as ready for review January 9, 2025 10:42
 Conflicts:
	build.mill
	main/package.mill
	scalalib/src/mill/scalalib/JavaModule.scala
	scalalib/src/mill/scalalib/PublishModule.scala
 Conflicts:
	build.mill
	example/fundamentals/out-dir/1-out-files/build.mill
Copy link
Member

@lefou lefou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

No idea about the failing CI jobs.

@lihaoyi
Copy link
Member

lihaoyi commented Jan 21, 2025

Seems like there's some docker issues with the new intel macos-13 job, will deal with that separately

@lihaoyi lihaoyi merged commit 8fc21f6 into com-lihaoyi:main Jan 21, 2025
27 of 28 checks passed
@lefou lefou added this to the 0.12.6 milestone Jan 21, 2025
@alexarchambault alexarchambault deleted the bom-scopes-cs-project branch January 21, 2025 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants