fix: when building 'dependencyUsages', merge usages of the same dependency at different versions. #1230
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
|
@jjohannes I think this resolves #947. |
autonomousapps
commented
Jul 26, 2024
src/main/kotlin/com/autonomousapps/model/intermediates/Usage.kt
Outdated
Show resolved
Hide resolved
autonomousapps
commented
Jul 26, 2024
Comment on lines
+95
to
+111
| val other = keys.find { it.identifier == trace.coordinates.identifier } | ||
| if (other != null) { | ||
| val otherVersion = (other as? ModuleCoordinates)?.resolvedVersion | ||
| val thisVersion = (trace.coordinates as? ModuleCoordinates)?.resolvedVersion | ||
| if (otherVersion != null && thisVersion != null && otherVersion != thisVersion) { | ||
| // This mutates the existing set in place | ||
| val usages = get(other)!!.apply { add(usage) } | ||
|
|
||
| // If the new coordinates are "greater than" the other coordinates, add the new and remove the old | ||
| if (thisVersion > otherVersion) { | ||
| put(trace.coordinates, usages) | ||
| remove(other) | ||
| } | ||
|
|
||
| // We're done | ||
| return | ||
| } |
There was a problem hiding this comment.
This change here is the fix.
autonomousapps
changed the title
This resolves an issue when a dependency is available at more than one version, and different usages at each version.
autonomousapps
force-pushed
the
trobalik.transitive-test-dep
branch
from
08725fb to
eda9cfa
Compare
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.
This resolves an issue when two versions of a dependency are in the various dependency graphs
(e.g., main and test). Without this, we were getting erroneous advice to remove used dependencies,
and then correct advice to re-add used-transitive dependencies. Additionally, the 'reason' results
were confusing and incorrect for a similar reason. As the simplest solution, require full GAV when
requesting the 'reason for' some advice in this circumstance.
There is still one minor issue in the reason output, which is it'll print the shortest path to all
versions of a given dep, even when a specific version is requested.