Skip to content

Commit cf3e4fa

Browse files
authored
Merge pull request #1040 from redwarp/fix/1039_fix_discrepancies_list
Fix dependency collection to match gradle task
2 parents 80edf05 + be406be commit cf3e4fa

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/DependencyCollector.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,17 @@ class DependencyCollector(
126126

127127
else -> {
128128
if (LOGGER.isDebugEnabled) LOGGER.debug("retrieve allModuleArtifacts from artifact")
129-
resolvedDependency.allModuleArtifacts
129+
val allArtifacts = resolvedDependency.allModuleArtifacts
130+
if (includePlatform) allArtifacts + resolvedDependency.toResolvedBomArtifact()
131+
allArtifacts
130132
}
131133
}
132134
} catch (e: Throwable) {
133135
when {
134136
LOGGER.isDebugEnabled -> {
135137
LOGGER.warn("Found possibly ambiguous variant - $resolvedDependency", e)
136138
}
139+
137140
LOGGER.isInfoEnabled -> {
138141
LOGGER.warn("Found possibly ambiguous variant - $resolvedDependency")
139142
}

plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/Extensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ internal fun <T> chooseValue(uniqueId: String, key: String, value: Array<T>?, bl
6363
}
6464

6565
/**
66-
* Convenient helper to wrap a [ResolvedDependency] into a []ResolvedArtifact]
66+
* Convenient helper to wrap a [ResolvedDependency] into a [ResolvedArtifact]
6767
* Required to handle `platform` dependencies.
6868
*/
6969
internal fun ResolvedDependency.toResolvedBomArtifact() = object : ResolvedArtifact {

0 commit comments

Comments
 (0)