fixup! Support configuration cache for native download
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/SetupKotlinNativePlatformDependenciesAndStdlib.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/SetupKotlinNativePlatformDependenciesAndStdlib.kt
index ed1b052..3c7f311 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/SetupKotlinNativePlatformDependenciesAndStdlib.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/SetupKotlinNativePlatformDependenciesAndStdlib.kt
@@ -23,6 +23,7 @@
import org.jetbrains.kotlin.gradle.plugin.sources.internal
import org.jetbrains.kotlin.gradle.targets.metadata.isNativeSourceSet
import org.jetbrains.kotlin.gradle.targets.native.toolchain.KotlinNativeBundleBuildService
+import org.jetbrains.kotlin.gradle.targets.native.toolchain.KotlinNativeFromToolchainProvider
import org.jetbrains.kotlin.gradle.utils.konanDistribution
import org.jetbrains.kotlin.konan.target.KonanTarget
import java.io.File
@@ -87,10 +88,17 @@
.filterIsInstance<DefaultKotlinSourceSet>()
val stdlib = project.files(project.konanDistribution.stdlib)
+ val nativeBundleBuildService = KotlinNativeBundleBuildService.registerIfAbsent(project)
+
sourceSets.forEach { sourceSet ->
-// val commonizerTarget = sourceSet.commonizerTarget.await() ?: return@forEach
-// val nativeDistributionDependencies = getNativeDistributionDependencies(commonizerTarget)
-// sourceSet.addDependencyForLegacyImport(nativeDistributionDependencies.get())
+ val commonizerTarget = sourceSet.commonizerTarget.await() ?: return@forEach
+ val konanDistributionProvider = KotlinNativeFromToolchainProvider(
+ project,
+ commonizerTarget.konanTargets,
+ nativeBundleBuildService
+ ).bundleDirectory.map { KonanDistribution(it) }
+ val nativeDistributionDependencies = getNativeDistributionDependencies(konanDistributionProvider, commonizerTarget)
+ sourceSet.addDependencyForLegacyImport(nativeDistributionDependencies)
sourceSet.addDependencyForLegacyImport(stdlib)
}
}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/toolchain/KotlinNativeBundleBuildService.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/toolchain/KotlinNativeBundleBuildService.kt
index 9f71b82..68a59a0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/toolchain/KotlinNativeBundleBuildService.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/toolchain/KotlinNativeBundleBuildService.kt
@@ -103,6 +103,7 @@
}
}
}
+
internal fun getNativeDistributionDependencies(
project: Project,
commonizerTarget: CommonizerTarget,
