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

[Gradle] Support KotlinNativeLinkArtifactTask with Configuration Cache

Browse Source
This commit is contained in:
Anton Lakotka
2022-06-21 09:16:04 +02:00
committed by Space
parent eaa5d43a5d
commit af717e03bd
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
+11 -8
View File
@@ -34,13 +34,14 @@ open class KotlinNativeLinkArtifactTask @Inject constructor(
@get:Input @get:Input
var baseName: String = project.name var baseName: String = project.name
private val defaultDestinationDir: File private val buildDir = project.buildDir
get() {
val kind = outputKind.visibleName private val defaultDestinationDir: File get() {
val target = konanTarget.visibleName val kind = outputKind.visibleName
val type = if (debuggable) "debug" else "release" val target = konanTarget.visibleName
return project.buildDir.resolve("out/$kind/$target/$type") val type = if (debuggable) "debug" else "release"
} return buildDir.resolve("out/$kind/$target/$type")
}
private var customDestinationDir: File? = null private var customDestinationDir: File? = null
@@ -109,6 +110,8 @@ open class KotlinNativeLinkArtifactTask @Inject constructor(
@get:Input @get:Input
var binaryOptions: Map<String, String> = emptyMap() var binaryOptions: Map<String, String> = emptyMap()
private val nativeBinaryOptions = PropertiesProvider(project).nativeBinaryOptions
@get:Internal @get:Internal
val kotlinOptions = object : KotlinCommonToolOptions { val kotlinOptions = object : KotlinCommonToolOptions {
override var allWarningsAsErrors: Boolean = false override var allWarningsAsErrors: Boolean = false
@@ -158,7 +161,7 @@ open class KotlinNativeLinkArtifactTask @Inject constructor(
fun FileCollection.klibs() = files.filter { it.extension == "klib" } fun FileCollection.klibs() = files.filter { it.extension == "klib" }
val localBinaryOptions = PropertiesProvider(project).nativeBinaryOptions + binaryOptions val localBinaryOptions = nativeBinaryOptions + binaryOptions
val buildArgs = buildKotlinNativeBinaryLinkerArgs( val buildArgs = buildKotlinNativeBinaryLinkerArgs(
outFile = outFile, outFile = outFile,