commit 9a19b71915a30bfc2f0a52d6e8227ec36c7e594a
author Anton Lakotka <anton.lakotka@jetbrains.com> Tue Sep 13 22:45:19 2022 +0200
committer Anton Lakotka <anton.lakotka@jetbrains.com> Tue Sep 13 22:45:19 2022 +0200
tree 7eabd9e294856cfc223cb7d1ec5a856c720aebab
parent 31f10ab494158a85079a7b0d5ae33fee29e6f6db

fix tests after indroducing external dependency lookup

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 80b2a2f..b86472d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -984,7 +984,7 @@
             .filterIsInstance<ResolvedDependencyResult>()
             .forEach { ensureDependencyPrecached(it, visitedDependencies) }
 
-        val artifactsToAddToCache = dependencyArtifacts(dependency).filter { needCache(it.file.absolutePath) }
+        val artifactsToAddToCache = moduleArtifacts(dependency).filter { needCache(it.file.absolutePath) }
 
         if (artifactsToAddToCache.isEmpty()) return
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt
index 6412559..da33909 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/cacheKlibUtils.kt
@@ -72,7 +72,7 @@
 ): List<File>? {
     return getAllDependencies(dependency)
         .flatMap { childDependency ->
-            resolvedDependencyGraph.dependencyArtifacts(childDependency).map {
+            resolvedDependencyGraph.moduleArtifacts(childDependency).map {
                 if (libraryFilter(it)) {
                     val cacheDirectory = getCacheDirectory(
                         rootCacheDirectory = rootCacheDirectory,

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/configurations.kt

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/configurations.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/configurations.kt
index 242ffdb..28a2edd 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/configurations.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/configurations.kt
@@ -78,6 +78,11 @@
         null
     }
 
+    fun moduleArtifacts(dependency: ResolvedDependencyResult): List<ResolvedArtifactResult> {
+        val componentId = dependency.resolvedVariant.owner
+        return artifactsByComponentId[componentId] ?: emptyList()
+    }
+
     /**
      * [ResolvedVariantResult.getExternalVariant] is available in Gradle API since 6.8
      * For lower gradle versions this variant can be calculated Heuristically