Avoid accessing KotlinNativeLink taskProvider when task was not executed

nav-nav · Space Team · commit 67a08681cdd5 · 2026-04-15T13:26:46.000Z
#KT-85628
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/FusStatisticsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/FusStatisticsIT.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.gradle.report.BuildReportType
 import org.jetbrains.kotlin.gradle.testbase.*
 import org.jetbrains.kotlin.gradle.testbase.BuildOptions.IsolatedProjectsMode
 import org.jetbrains.kotlin.gradle.uklibs.applyMultiplatform
+import org.jetbrains.kotlin.gradle.uklibs.includeBuild
 import org.jetbrains.kotlin.gradle.util.filterBackwardCompatibilityKotlinFusFiles
 import org.jetbrains.kotlin.gradle.util.filterKotlinFusFiles
 import org.jetbrains.kotlin.gradle.util.replaceText
@@ -832,6 +833,30 @@ class FusStatisticsIT : KGPBaseTest() {
         return expectedFiles
     }
 
+    @DisplayName("FUS should not break project configuration for included build")
+    @GradleTest
+    @MppGradlePluginTests
+    fun testProjectConfiguration(gradleVersion: GradleVersion) {
+        project("empty", gradleVersion) {
+            val included = project("empty", gradleVersion) {
+                plugins {
+                    kotlin("multiplatform")
+                }
+                buildScriptInjection {
+                    project.applyMultiplatform {
+                        iosArm64()
+                        iosSimulatorArm64()
+                    }
+                }
+            }
+            includeBuild(included)
+
+            build("help", "-Pkotlin.session.logger.root.path=$projectPath") {
+                assertOutputDoesNotContainFusErrors()
+            }
+        }
+    }
+
     private fun TestProject.applyDokka(version: String) {
         buildGradle.replaceText(
             "plugins {",
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotilnNativeConfigureBinariesSideEffect.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotilnNativeConfigureBinariesSideEffect.kt
@@ -148,10 +148,10 @@ private fun Project.createLinkTask(binary: NativeBinary) {
                 }
             )
             .disallowChanges()
+        KotlinNativeCacheMetrics.collectMetrics(this, task.disableCache)
     }
 
     NativeLinkTaskMetrics.collectMetrics(this)
-    KotlinNativeCacheMetrics.collectMetrics(this, linkTask.flatMap { it.disableCache })
 
     if (binary !is TestExecutable) {
         tasks.named(binary.compilation.target.artifactsTaskName).dependsOn(linkTask)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledNativeCacheTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledNativeCacheTest.kt
@@ -267,6 +267,9 @@ class DisabledNativeCacheTest {
 
             evaluate()
 
+            //init task to ensure configuration time metrics are collected
+            tasks.named(LINUX_X64_LINK_DEBUG_TASK_NAME, KotlinNativeLink::class.java).get()
+
             assertNotNull(
                 collectedFusConfigurationTimeMetrics.booleanMetrics.entries.singleOrNull {
                     it.key == BooleanMetrics.KOTLIN_NATIVE_CACHE_DISABLED && it.value

Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,10 @@ private fun Project.createLinkTask(binary: NativeBinary) {`
`148`	`148`	`}`
`149`	`149`	`)`
`150`	`150`	`.disallowChanges()`
	`151`	`+ KotlinNativeCacheMetrics.collectMetrics(this, task.disableCache)`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`NativeLinkTaskMetrics.collectMetrics(this)`
`154`		`- KotlinNativeCacheMetrics.collectMetrics(this, linkTask.flatMap { it.disableCache })`
`155`	`155`
`156`	`156`	`if (binary !is TestExecutable) {`
`157`	`157`	`tasks.named(binary.compilation.target.artifactsTaskName).dependsOn(linkTask)`