Make runtime deps transitive #3774
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
myyk
reviewed
Oct 28, 2024
| /** Should only be called from [[moduleDepsChecked]] */ | ||
| private lazy val recRunModuleDeps: Seq[JavaModule] = | ||
| ModuleUtils.recursive[JavaModule]( | ||
| (millModuleSegments ++ Seq(Segment.Label("moduleDeps"))).render, |
There was a problem hiding this comment.
should this be: moduleDeps -> runModuleDeps
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3761
Fixes #3819
Introduce
runModuleDeps, the runtime version ofmoduleDepsandcompileModuleDepsWe introduce
transitiveRunIvyDeps, the runtime version oftransitiveIvyDeps, and use it in most places as a replacement forrunIvyDepsI also flipped the ordering of
transitiveModuleDeps/transitiveRunModuleDepsto putthison the right/last, to follow the rest of the module resolution logic where "upstream" things come on the left/first in the classpath orderingThere are some behavioral changes, e.g. the A module's direct
compileModuleDepsno longer end up on yourrunClasspath, as shown by the change in the test casemill.scalalib.ScalaMultiModuleClasspathsTests.modCompile. I think the new behavior is more correct than the old one?One (benign?) consequence of this change is that the contents of the various
*run*tasks now have considerable overlap with the non-runtasks, e.g.transitiveRunIvyDepsoverlaps withtransitiveIvyDeps.The way transitive runtime dependencies are now managed, both "
run{Module,Ivy}Depof{module,ivy}Dep" and "{module,ivy}Depofrun{Module,Ivy}Dep" are both aggregated into the run classpath. I'm not sure if this matches what Maven does (it does according to chatgpt!) but it seems reasonable to meAdded some additional unit tests to cover the new transitive behavior. The whole dependency-wiring stuff is pretty gnarly but hopefully the existing test suite will stop us from breaking too much (especially
mill.scalalib.ScalaMultiModuleClasspathsTestswhich is pretty rigorous and we add to).This is a binary-compatible but semantically incompatible change, would be good to get it into 0.12.0
Best reviewed with
Hide Whitespaceenabled