Don't override task action in KaptGenerateStubsTask
This commit is contained in:
+2
-16
@@ -83,24 +83,10 @@ open class KaptGenerateStubsTask : KotlinCompile() {
|
|||||||
args.destinationAsFile = this.destinationDir
|
args.destinationAsFile = this.destinationDir
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun execute(inputs: IncrementalTaskInputs) {
|
override fun getSourceRoots(): SourceRoots.ForJvm =
|
||||||
val sourceRoots = kotlinCompileTask.getSourceRoots().let {
|
kotlinCompileTask.getSourceRoots().let {
|
||||||
val javaSourceRoots = it.javaSourceRoots.filterTo(HashSet()) { isSourceRootAllowed(it) }
|
val javaSourceRoots = it.javaSourceRoots.filterTo(HashSet()) { isSourceRootAllowed(it) }
|
||||||
val kotlinSourceFiles = it.kotlinSourceFiles
|
val kotlinSourceFiles = it.kotlinSourceFiles
|
||||||
SourceRoots.ForJvm(kotlinSourceFiles, javaSourceRoots)
|
SourceRoots.ForJvm(kotlinSourceFiles, javaSourceRoots)
|
||||||
}
|
}
|
||||||
val allKotlinSources = sourceRoots.kotlinSourceFiles
|
|
||||||
|
|
||||||
logger.kotlinDebug { "All kotlin sources: ${allKotlinSources.pathsAsStringRelativeTo(project.rootProject.projectDir)}" }
|
|
||||||
|
|
||||||
if (allKotlinSources.isEmpty()) {
|
|
||||||
logger.kotlinDebug { "No Kotlin files found, skipping KaptGenerateStubs task" }
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceRoots.log(this.name, logger)
|
|
||||||
val args = prepareCompilerArguments()
|
|
||||||
|
|
||||||
callCompilerAsync(args, sourceRoots, ChangedFiles(inputs))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+2
-2
@@ -256,14 +256,14 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
|
|||||||
}
|
}
|
||||||
|
|
||||||
@TaskAction
|
@TaskAction
|
||||||
open fun execute(inputs: IncrementalTaskInputs): Unit {
|
fun execute(inputs: IncrementalTaskInputs) {
|
||||||
// Check that the JDK tools are available in Gradle (fail-fast, instead of a fail during the compiler run):
|
// Check that the JDK tools are available in Gradle (fail-fast, instead of a fail during the compiler run):
|
||||||
findToolsJar()
|
findToolsJar()
|
||||||
|
|
||||||
val sourceRoots = getSourceRoots()
|
val sourceRoots = getSourceRoots()
|
||||||
val allKotlinSources = sourceRoots.kotlinSourceFiles
|
val allKotlinSources = sourceRoots.kotlinSourceFiles
|
||||||
|
|
||||||
logger.kotlinDebug { "all kotlin sources: ${allKotlinSources.pathsAsStringRelativeTo(project.rootProject.projectDir)}" }
|
logger.kotlinDebug { "All kotlin sources: ${allKotlinSources.pathsAsStringRelativeTo(project.rootProject.projectDir)}" }
|
||||||
|
|
||||||
if (allKotlinSources.isEmpty()) {
|
if (allKotlinSources.isEmpty()) {
|
||||||
logger.kotlinDebug { "No Kotlin files found, skipping Kotlin compiler task" }
|
logger.kotlinDebug { "No Kotlin files found, skipping Kotlin compiler task" }
|
||||||
|
|||||||
Reference in New Issue
Block a user