From f3830cb07e4cde5a222c2340d7105cd485c07e35 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Fri, 1 May 2020 12:56:10 +0300
Subject: [PATCH] Make KotlinNativeTasks.konanTargetsForManifest non-nullable,
 otherwise Gradle fails

---
 .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 9fab3674e12..97ad06eba74 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -249,10 +249,11 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions> : Abstra
 
     @get:Input
     @get:Optional
-    internal val konanTargetsForManifest: String? by project.provider {
+    internal val konanTargetsForManifest: String by project.provider {
         (compilation as? KotlinSharedNativeCompilation)
             ?.konanTargets
             ?.joinToString(separator = " ") { it.visibleName }
+            .orEmpty()
     }
 
     @get:Internal
@@ -301,7 +302,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions> : Abstra
             val manifestFile: File = manifestFile.get()
             manifestFile.ensureParentDirsCreated()
             val properties = java.util.Properties()
-            properties[KLIB_PROPERTY_NATIVE_TARGETS] = konanTargetsForManifest!!
+            properties[KLIB_PROPERTY_NATIVE_TARGETS] = konanTargetsForManifest
             properties.saveToFile(org.jetbrains.kotlin.konan.file.File(manifestFile.toPath()))
         }