From 357518be0dcc486d24f1f924649bd7111f605b46 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 27 Jun 2018 02:32:14 +0300 Subject: [PATCH] Remove projectDir input from KaptWithoutKotlincTask It is redundant since the task would be restarted when project dir changes, because paths of sources would also change --- .../gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt | 2 -- .../kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt index 9f11a478018..66a98896aa1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt @@ -378,8 +378,6 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin { if (kaptTask is KaptWithoutKotlincTask) { with(kaptTask) { - projectDir = project.projectDir - isVerbose = project.isKaptVerbose() mapDiagnosticLocations = kaptExtension.mapDiagnosticLocations annotationProcessorFqNames = kaptExtension.processors.split(',').filter { it.isNotEmpty() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt index 6517496f703..52c734aef69 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt @@ -25,10 +25,6 @@ open class KaptWithoutKotlincTask @Inject constructor(private val workerExecutor val kaptJars: Collection get() = project.configurations.getByName(KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME).resolve() - @get:InputFile - @get:PathSensitive(PathSensitivity.RELATIVE) - lateinit var projectDir: File - @get:Input var isVerbose: Boolean = false @@ -51,7 +47,7 @@ open class KaptWithoutKotlincTask @Inject constructor(private val workerExecutor clearOutputDirectories() val paths = KaptPathsForWorker( - projectDir, + project.projectDir, classpath.files.toList(), kaptClasspath.files.toList(), javaSourceRoots.toList(),