From 26c158cbae49f609bf76e96fd3741075aadf54f8 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Thu, 16 Nov 2017 22:16:41 +0300
Subject: [PATCH] Annotate the properties with @PathSensitive (+ override
 source)

---
 .../kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt  | 3 ++-
 .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt   | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
index 33a37ff8ed4..3c7ef00f822 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
@@ -58,8 +58,9 @@ open class KaptTask : ConventionTask(), CompilerArgumentAware<K2JVMCompilerArgum
     @get:Classpath @get:InputFiles
     internal val pluginClasspath get() = pluginOptions.classpath
 
+    @get:InputFiles @get:PathSensitive(PathSensitivity.ABSOLUTE)
     val source: FileCollection
-        @InputFiles get() {
+        get() {
             val sourcesFromKotlinTask = kotlinCompileTask.source
                     .filter { it.extension == "java" && !isInsideDestinationDirs(it) }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index f9d74885aa9..b5e36709106 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -63,6 +63,10 @@ abstract class AbstractKotlinCompileTool<T : CommonToolArguments>() : AbstractCo
     @get:Internal
     var compilerClasspath: List<File>? = null
 
+    @InputFiles
+    @PathSensitive(PathSensitivity.ABSOLUTE)
+    override fun getSource() = super.getSource()
+
     @get:Classpath @get:InputFiles
     internal val computedCompilerClasspath: List<File>
         get() = compilerClasspath?.takeIf { it.isNotEmpty() }
@@ -461,6 +465,7 @@ open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArguments>(),
 
     @get:InputFiles
     @get:Optional
+    @get:PathSensitive(PathSensitivity.ABSOLUTE)
     internal val friendDependency
         get() = friendTaskName
                 ?.let { project.getTasksByName(it, false).singleOrNull() as? Kotlin2JsCompile }