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.

Sign up for GitHub

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

Fix dependency collection to match gradle task #1040

Merged
merged 2 commits into from
Nov 29, 2024
Merged

Fix dependency collection to match gradle task #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a6c41
Fix dependency collection to include umbrella libraries
redwarp Nov 26, 2024
be406be
- only include the platform if `includePlatform` is enabled
mikepenz Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ild/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/DependencyCollector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,17 @@ class DependencyCollector(

else -> {
if (LOGGER.isDebugEnabled) LOGGER.debug("retrieve allModuleArtifacts from artifact")
resolvedDependency.allModuleArtifacts
val allArtifacts = resolvedDependency.allModuleArtifacts
if (includePlatform) allArtifacts + resolvedDependency.toResolvedBomArtifact()
allArtifacts
}
}
} catch (e: Throwable) {
when {
LOGGER.isDebugEnabled -> {
LOGGER.warn("Found possibly ambiguous variant - $resolvedDependency", e)
}

LOGGER.isInfoEnabled -> {
LOGGER.warn("Found possibly ambiguous variant - $resolvedDependency")
}
Expand Down
2 changes: 1 addition & 1 deletion plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/Extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal fun <T> chooseValue(uniqueId: String, key: String, value: Array<T>?, bl
}

/**
* Convenient helper to wrap a [ResolvedDependency] into a []ResolvedArtifact]
* Convenient helper to wrap a [ResolvedDependency] into a [ResolvedArtifact]
* Required to handle `platform` dependencies.
*/
internal fun ResolvedDependency.toResolvedBomArtifact() = object : ResolvedArtifact {
Expand Down
Loading