Merge pull request #1040 from redwarp/fix/1039_fix_discrepancies_list

Fix dependency collection to match gradle task
mikepenz · Nov 29, 2024 · cf3e4fa · cf3e4fa
2 parents 80edf05 + be406be
commit cf3e4fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ild/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/DependencyCollector.kt b/...ild/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/DependencyCollector.kt
@@ -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")
                         }

diff --git a/plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/Extensions.kt b/plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/util/Extensions.kt
@@ -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 {