azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make KotlinNativeTasks.konanTargetsForManifest non-nullable, otherwise Gradle fails

Browse Source
This commit is contained in:
Dmitry Savvinov
2020-05-01 12:56:10 +03:00
parent 686d00ddf5
commit f3830cb07e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+3 -2
View File
@@ -249,10 +249,11 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions> : Abstra
@get:Input @get:Input
@get:Optional @get:Optional
internal val konanTargetsForManifest: String? by project.provider { internal val konanTargetsForManifest: String by project.provider {
(compilation as? KotlinSharedNativeCompilation) (compilation as? KotlinSharedNativeCompilation)
?.konanTargets ?.konanTargets
?.joinToString(separator = " ") { it.visibleName } ?.joinToString(separator = " ") { it.visibleName }
.orEmpty()
} }
@get:Internal @get:Internal
@@ -301,7 +302,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions> : Abstra
val manifestFile: File = manifestFile.get() val manifestFile: File = manifestFile.get()
manifestFile.ensureParentDirsCreated() manifestFile.ensureParentDirsCreated()
val properties = java.util.Properties() 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())) properties.saveToFile(org.jetbrains.kotlin.konan.file.File(manifestFile.toPath()))
} }