Skip to content

Commit

Permalink
Merge pull request #971 from mikepenz/fix/protect_all_module_dependen…
Browse files Browse the repository at this point in the history
…cies

Protect from problems collecting all dependencies
  • Loading branch information
mikepenz committed Apr 9, 2024
2 parents 1a68e86 + 0c7536e commit 1c5aae6
Showing 1 changed file with 19 additions and 15 deletions.
Expand Up @@ -74,17 +74,21 @@ class DependencyCollector(
val visitedDependencyNames = mutableSetOf<String>()

if (LOGGER.isDebugEnabled) LOGGER.debug("Pre-fetching dependencies for $variant")
configuration
.resolvedConfiguration
.lenientConfiguration
.allModuleDependencies
.getResolvedArtifacts(visitedDependencyNames)
.forEach { resArtifact ->
val identifier = "${resArtifact.moduleVersion.id.group.trim()}:${resArtifact.name.trim()}"
if (LOGGER.isDebugEnabled) LOGGER.debug("Retrieved for $variant :: $identifier")
val versions = variantSet.getOrPut(identifier) { LinkedHashSet() }
versions.add(resArtifact.moduleVersion.id.version.trim())
}
try {
configuration
.resolvedConfiguration
.lenientConfiguration
.allModuleDependencies
.getResolvedArtifacts(visitedDependencyNames)
.forEach { resArtifact ->
val identifier = "${resArtifact.moduleVersion.id.group.trim()}:${resArtifact.name.trim()}"
if (LOGGER.isDebugEnabled) LOGGER.debug("Retrieved for $variant :: $identifier")
val versions = variantSet.getOrPut(identifier) { LinkedHashSet() }
versions.add(resArtifact.moduleVersion.id.version.trim())
}
} catch (t: Throwable) {
LOGGER.error("Failed to retrieve dependencies for $variant", t)
}

if (LOGGER.isDebugEnabled) LOGGER.debug("Completed-fetching dependencies for $variant")
}
Expand Down Expand Up @@ -148,10 +152,10 @@ class DependencyCollector(
private val testCompile = setOf("testCompile", "androidTestCompile")
private val Configuration.isTest
get() = name.startsWith("test", ignoreCase = true) ||
name.startsWith("androidTest", ignoreCase = true) ||
hierarchy.any { configurationHierarchy ->
testCompile.any { configurationHierarchy.name.contains(it, ignoreCase = true) }
}
name.startsWith("androidTest", ignoreCase = true) ||
hierarchy.any { configurationHierarchy ->
testCompile.any { configurationHierarchy.name.contains(it, ignoreCase = true) }
}

private val platform = "platform"

Expand Down

0 comments on commit 1c5aae6

Please sign in to comment.