From fbd8de04b8d3bc09362564ccba33de45f3a2e3a4 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Thu, 5 Nov 2020 17:45:04 +0300 Subject: [PATCH] [Gradle, K/N] Configuration cache support for run with warns #KT-42849 Fixed --- .../kotlin/gradle/targets/native/KotlinNativeTarget.kt | 3 ++- .../jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt index 73401418a26..680598acec1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt @@ -64,7 +64,8 @@ open class KotlinNativeTarget @Inject constructor( metadataJar.archiveAppendix.set(project.provider { disambiguationClassifier.orEmpty().toLowerCase() }) metadataJar.archiveClassifier.set("metadata") - metadataJar.onlyIf { this@KotlinNativeTarget.publishable } + val publishable = this@KotlinNativeTarget.publishable + metadataJar.onlyIf { publishable } val metadataCompilations = hostSpecificSourceSets.mapNotNull { project.getMetadataCompilationForSourceSet(it) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt index 82f92a66344..eda05f6daf8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt @@ -93,8 +93,9 @@ sealed class NativeBinary( buildDir.resolve("bin/$targetSubDirectory${this@NativeBinary.name}") } - val outputFile: File - get() = linkTask.outputFile.get() + val outputFile: File by lazy { + linkTask.outputFile.get() + } // Named implementation. override fun getName(): String = name