From bf10c1162a36dd5e7998a3951172874950e287fc Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 25 May 2018 00:07:44 +0300
Subject: [PATCH] Kapt: Fix Gradle input/output verification

---
 .../jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
index 8e83d0f3565..dd62a2e4582 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
@@ -1,16 +1,10 @@
 package org.jetbrains.kotlin.gradle.internal
 
-import org.gradle.api.GradleException
+import com.intellij.openapi.util.io.FileUtil
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.ConventionTask
 import org.gradle.api.tasks.*
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.compilerRunner.GradleCompilerEnvironment
-import org.jetbrains.kotlin.compilerRunner.GradleCompilerRunner
-import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
-import org.jetbrains.kotlin.gradle.plugin.compareVersionNumbers
-import org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME
 import org.jetbrains.kotlin.gradle.tasks.*
 import org.jetbrains.kotlin.gradle.utils.isJavaFile
 import org.jetbrains.kotlin.gradle.utils.isParentOf
@@ -18,7 +12,7 @@ import org.jetbrains.kotlin.gradle.utils.toSortedPathsArray
 import java.io.File
 
 @CacheableTask
-open class KaptTask : ConventionTask() {
+abstract class KaptTask : ConventionTask() {
     init {
         cacheOnlyIfEnabledForKotlin()
 
@@ -74,6 +68,7 @@ open class KaptTask : ConventionTask() {
             return result
         }
 
+    @get:Internal
     protected val javaSourceRoots: Set<File>
         get() = (kotlinCompileTask.sourceRootsContainer.sourceRoots + stubsDir)
             .filterTo(HashSet(), ::isRootAllowed)