fixup! Support configuration cache
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 3b44ed5..51d7a92 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
@@ -51,12 +51,11 @@
val nativeBundleBuildService = KotlinNativeBundleBuildService.registerIfAbsent(project)
// val kotlinNativeProvider = KotlinNativeFromToolchainProvider(project, commonizerTarget.konanTargets, nativeBundleBuildService)
- val nativeDependency = nativeBundleBuildService.map { kotlinNativeBundleBuildService ->
- kotlinNativeBundleBuildService.getNativeDistributionDependencies(
+ val nativeDependency = nativeBundleBuildService.orNull?.getNativeDistributionDependencies(
project,
commonizerTarget
)
- }
+
val updatedCompileDependencyFiles = project.files().from(
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 5dca595..a6719b4 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
@@ -136,8 +136,20 @@
internal fun getNativeDistributionDependencies(
project: Project,
+// task: Task,
commonizerTarget: CommonizerTarget,
- ) = project.getNativeDistributionDependencies(commonizerTarget)
+ ) = project.getNativeDistributionDependencies(commonizerTarget)//exclude dependecies
+// tasks.withType<KotlinNativeLink>().configureEach { task ->
+// @Suppress("DEPRECATION")
+// val konanTarget = task.compilation.konanTarget
+// task.excludeOriginalPlatformLibraries = task.project.getOriginalPlatformLibrariesFor(konanTarget)
+// }
+// tasks.withType<KotlinNativeCompile>().configureEach { task ->
+// // metadata compilations should have commonized platform libraries in the classpath i.e. they are not "original"
+// if (task.isMetadataCompilation) return@configureEach
+// val konanTarget = task.konanTarget
+// task.excludeOriginalPlatformLibraries = task.project.getOriginalPlatformLibrariesFor(konanTarget)
+// }
private fun processToolchain(
