From 6534f36dbd8afe271e55101c12a1755105bb02a9 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 17 Jul 2017 18:55:50 +0700
Subject: [PATCH] gradle-plugin: Fix incremental build for 'manifest' argument

---
 .../jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt
index af2752a11f9..b67bed83046 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt
@@ -131,7 +131,8 @@ open class KonanCompileTask: KonanTargetableTask() {
         internal set
     @Optional @Input var apiVersion      : String? = null
         internal set
-    @Optional @Input var manifest        : String? = null
+
+    @Optional @InputFile var manifest    : File? = null
         internal set
 
     @Input var dumpParameters: Boolean = false
@@ -152,7 +153,7 @@ open class KonanCompileTask: KonanTargetableTask() {
         addArgIfNotNull("-target", target)
         addArgIfNotNull("-language-version", languageVersion)
         addArgIfNotNull("-api-version", apiVersion)
-        addArgIfNotNull("-manifest", manifest)
+        addArgIfNotNull("-manifest", manifest?.canonicalPath)
 
         addKey("-g", enableDebug)
         addKey("-nostdlib", noStdLib)
@@ -287,8 +288,8 @@ open class KonanCompileConfig(
         linkerOpts.addAll(args)
     }
 
-    fun manifest(arg: String) = with(compilationTask) {
-        manifest = arg
+    fun manifest(arg: Any) = with(compilationTask) {
+        manifest = project.file(arg)
     }
 
     fun target(tgt: String) = with(compilationTask) {