diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt index 2ff1eb010e2..05869c678be 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt @@ -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 = mutableMapOf() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt index 43a548a9519..86604031a33 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt @@ -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? { 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 {