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
This commit is contained in:
-2
@@ -378,8 +378,6 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
|
|||||||
|
|
||||||
if (kaptTask is KaptWithoutKotlincTask) {
|
if (kaptTask is KaptWithoutKotlincTask) {
|
||||||
with(kaptTask) {
|
with(kaptTask) {
|
||||||
projectDir = project.projectDir
|
|
||||||
|
|
||||||
isVerbose = project.isKaptVerbose()
|
isVerbose = project.isKaptVerbose()
|
||||||
mapDiagnosticLocations = kaptExtension.mapDiagnosticLocations
|
mapDiagnosticLocations = kaptExtension.mapDiagnosticLocations
|
||||||
annotationProcessorFqNames = kaptExtension.processors.split(',').filter { it.isNotEmpty() }
|
annotationProcessorFqNames = kaptExtension.processors.split(',').filter { it.isNotEmpty() }
|
||||||
|
|||||||
+1
-5
@@ -25,10 +25,6 @@ open class KaptWithoutKotlincTask @Inject constructor(private val workerExecutor
|
|||||||
val kaptJars: Collection<File>
|
val kaptJars: Collection<File>
|
||||||
get() = project.configurations.getByName(KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME).resolve()
|
get() = project.configurations.getByName(KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME).resolve()
|
||||||
|
|
||||||
@get:InputFile
|
|
||||||
@get:PathSensitive(PathSensitivity.RELATIVE)
|
|
||||||
lateinit var projectDir: File
|
|
||||||
|
|
||||||
@get:Input
|
@get:Input
|
||||||
var isVerbose: Boolean = false
|
var isVerbose: Boolean = false
|
||||||
|
|
||||||
@@ -51,7 +47,7 @@ open class KaptWithoutKotlincTask @Inject constructor(private val workerExecutor
|
|||||||
clearOutputDirectories()
|
clearOutputDirectories()
|
||||||
|
|
||||||
val paths = KaptPathsForWorker(
|
val paths = KaptPathsForWorker(
|
||||||
projectDir,
|
project.projectDir,
|
||||||
classpath.files.toList(),
|
classpath.files.toList(),
|
||||||
kaptClasspath.files.toList(),
|
kaptClasspath.files.toList(),
|
||||||
javaSourceRoots.toList(),
|
javaSourceRoots.toList(),
|
||||||
|
|||||||
Reference in New Issue
Block a user