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

gradle-plugin: Use @OutputFile in konanCompileTask

Browse Source
This commit is contained in:
Ilya Matveev
2017-06-19 16:28:49 +07:00
committed by ilmat192
parent 4daebe47a9
commit 0063d162bf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt
+4 -2
View File
@@ -82,7 +82,6 @@ open class KonanCompileTask: KonanTargetableTask() {
internal lateinit var artifactName: String internal lateinit var artifactName: String
@OutputDirectory
lateinit var outputDir: File lateinit var outputDir: File
internal set internal set
@@ -101,6 +100,9 @@ open class KonanCompileTask: KonanTargetableTask() {
val artifactPath: String val artifactPath: String
get() = "$artifactNamePath$artifactSuffix" get() = "$artifactNamePath$artifactSuffix"
val artifact: File
@OutputFile get() = project.file(artifactPath)
// Other compilation parameters ------------------------------------------- // Other compilation parameters -------------------------------------------
@InputFiles val inputFiles = mutableSetOf<FileCollection>() @InputFiles val inputFiles = mutableSetOf<FileCollection>()
@@ -221,7 +223,7 @@ open class KonanCompileConfig(
compilationTask.dependsOn(generateStubsTask) compilationTask.dependsOn(generateStubsTask)
linkerOpts(generateStubsTask.linkerOpts) linkerOpts(generateStubsTask.linkerOpts)
library(compileStubsTask.artifactNamePath) library(compileStubsTask.artifact)
nativeLibraries(project.fileTree(generateStubsTask.libsDir).apply { nativeLibraries(project.fileTree(generateStubsTask.libsDir).apply {
builtBy(generateStubsTask) builtBy(generateStubsTask)
include("**/*.bc") include("**/*.bc")