From 1db09d78b3e7d04800f713873ac5dcef41c76fdb Mon Sep 17 00:00:00 2001 From: "nataliya.valtman" Date: Fri, 21 May 2021 20:24:49 +0300 Subject: [PATCH] KT-46833: print correct message when history files are unavailable --- .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 2f46d9d28cf..bb5f27b7f2d 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 @@ -353,11 +353,6 @@ abstract class AbstractKotlinCompile : AbstractKotl compilerArgumentsConfigurationFlags(defaultsOnly, ignoreClasspathResolutionErrors) ) } - - protected fun hasFilesInTaskBuildDirectory(): Boolean { - val taskBuildDir = taskBuildDirectory.get().asFile - return taskBuildDir.walk().any { it != taskBuildDir && it.isFile } - } } open class KotlinCompileArgumentsProvider>(taskProvider: T) { @@ -455,7 +450,7 @@ abstract class KotlinCompile @Inject constructor( val icEnv = if (isIncrementalCompilationEnabled()) { logger.info(USING_JVM_INCREMENTAL_COMPILATION_MESSAGE) IncrementalCompilationEnvironment( - if (hasFilesInTaskBuildDirectory()) changedFiles else ChangedFiles.Unknown(), + changedFiles, taskBuildDirectory.get().asFile, usePreciseJavaTracking = usePreciseJavaTracking, disableMultiModuleIC = disableMultiModuleIC, @@ -745,7 +740,7 @@ abstract class Kotlin2JsCompile @Inject constructor( val icEnv = if (isIncrementalCompilationEnabled()) { logger.info(USING_JS_INCREMENTAL_COMPILATION_MESSAGE) IncrementalCompilationEnvironment( - if (hasFilesInTaskBuildDirectory()) changedFiles else ChangedFiles.Unknown(), + changedFiles, taskBuildDirectory.get().asFile, multiModuleICSettings = multiModuleICSettings )