[Gradle, JS] Fix Native test and not consider artifact in path

This commit is contained in:
Ilya Goncharov
2022-01-19 19:21:55 +03:00
committed by Space
parent 443c0bf74f
commit 72656b49f4
2 changed files with 10 additions and 3 deletions
@@ -308,7 +308,8 @@ internal class CacheBuilder(
val dependenciesCacheDirectories = getDependenciesCacheDirectories(
rootCacheDirectory,
dependency,
libraryFilter = { libraryFilter(it.file) }
libraryFilter = { libraryFilter(it.file) },
considerArtifact = true
) ?: return
val nameMap: MutableMap<String, ResolvedArtifact> = mutableMapOf()
@@ -60,13 +60,19 @@ private fun computeDependenciesHash(dependency: ResolvedDependency): String {
fun getDependenciesCacheDirectories(
rootCacheDirectory: File,
dependency: ResolvedDependency,
libraryFilter: (ResolvedArtifact) -> Boolean = { it.file.absolutePath.endsWith(".klib") }
libraryFilter: (ResolvedArtifact) -> Boolean = { it.file.absolutePath.endsWith(".klib") },
considerArtifact: Boolean = false
): List<File>? {
return getAllDependencies(dependency)
.flatMap { childDependency ->
childDependency.moduleArtifacts.map {
if (libraryFilter(it)) {
val cacheDirectory = getCacheDirectory(rootCacheDirectory, childDependency, it, libraryFilter)
val cacheDirectory = getCacheDirectory(
rootCacheDirectory,
childDependency,
if (considerArtifact) it else null,
libraryFilter
)
if (!cacheDirectory.exists()) return null
cacheDirectory
} else {