From 467090bd9e11ae1cc0463cba95ae26157e13b525 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 16 Jan 2019 17:35:48 +0300 Subject: [PATCH] Don't override task action in KaptGenerateStubsTask --- .../internal/kapt/KaptGenerateStubsTask.kt | 18 ++---------------- .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 4 ++-- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt index 14fedb9266b..63f557e40a5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt @@ -83,24 +83,10 @@ open class KaptGenerateStubsTask : KotlinCompile() { args.destinationAsFile = this.destinationDir } - override fun execute(inputs: IncrementalTaskInputs) { - val sourceRoots = kotlinCompileTask.getSourceRoots().let { + override fun getSourceRoots(): SourceRoots.ForJvm = + kotlinCompileTask.getSourceRoots().let { val javaSourceRoots = it.javaSourceRoots.filterTo(HashSet()) { isSourceRootAllowed(it) } val kotlinSourceFiles = it.kotlinSourceFiles 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)) - } } \ No newline at end of file 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 9ba12c76b81..8c58982a951 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 @@ -256,14 +256,14 @@ abstract class AbstractKotlinCompile() : AbstractKo } @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): findToolsJar() val sourceRoots = getSourceRoots() 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()) { logger.kotlinDebug { "No Kotlin files found, skipping Kotlin compiler task" }