Issue #175 Improves variant and artifacts selection #194
Conversation
This file contains hidden or 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
There was a problem hiding this comment.
Pull Request Overview
This PR improves the variant and artifacts selection mechanism by refactoring how dependencies and disambiguation rules are applied, and ensures compatibility with Gradle versions ≥ 8.11. Key changes include:
- Replacing direct instantiation of dependency objects with mock objects in tests.
- Refactoring the DependenciesFinder to remove legacy methods and add disambiguation rules via a new helper.
- Updating plugin version references and integration tests to align with the new Gradle versions.
Reviewed Changes
Copilot reviewed 9 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/test/java/org/sonatype/gradle/plugins/scan/ossindex/OssIndexAuditTaskTest.java | Updated test dependency setup using mocks and task registration changes. |
| src/test/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinderTest.java | Modified tests to match the updated signature of findResolvedArtifacts and dependency processing. |
| src/main/java/org/sonatype/gradle/plugins/scan/common/VariantAttributeDisambiguationRule.java | New disambiguation rule class implemented to support variant selection. |
| src/main/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinder.java | Refactored dependency resolution and rule addition; legacy methods removed. |
| src/main/java/org/sonatype/gradle/plugins/scan/ScanPlugin.java | Adjusted task creation logic to use unified registration style. |
| src/integTest/java/org/sonatype/gradle/plugins/scan/ScanIT_Gradle_Versions_8_11_to_8_14.java | Updated integration test class name and version support to include Gradle 8.14. |
| README.md | Updated plugin version references to reflect the new release. |
Files not reviewed (4)
- gradle.properties: Language not supported
- gradle/wrapper/gradle-wrapper.properties: Language not supported
- gradlew: Language not supported
- gradlew.bat: Language not supported
src/main/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinder.java
Show resolved
Hide resolved
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.
Uses Disambiguation rules in a better way to resolve the multiple variants selection problem and make it compatible with Gradle >= 8.11
It relates to the following issue #s:
cc @bhamail / @DarthHater / @shaikhu