azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-46833: print correct message when history files are unavailable

Browse Source
This commit is contained in:
nataliya.valtman
2021-05-21 20:24:49 +03:00
parent 23faacd21b
commit 1db09d78b3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+2 -7
View File
@@ -353,11 +353,6 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> : AbstractKotl
compilerArgumentsConfigurationFlags(defaultsOnly, ignoreClasspathResolutionErrors) compilerArgumentsConfigurationFlags(defaultsOnly, ignoreClasspathResolutionErrors)
) )
} }
protected fun hasFilesInTaskBuildDirectory(): Boolean {
val taskBuildDir = taskBuildDirectory.get().asFile
return taskBuildDir.walk().any { it != taskBuildDir && it.isFile }
}
} }
open class KotlinCompileArgumentsProvider<T : AbstractKotlinCompile<out CommonCompilerArguments>>(taskProvider: T) { open class KotlinCompileArgumentsProvider<T : AbstractKotlinCompile<out CommonCompilerArguments>>(taskProvider: T) {
@@ -455,7 +450,7 @@ abstract class KotlinCompile @Inject constructor(
val icEnv = if (isIncrementalCompilationEnabled()) { val icEnv = if (isIncrementalCompilationEnabled()) {
logger.info(USING_JVM_INCREMENTAL_COMPILATION_MESSAGE) logger.info(USING_JVM_INCREMENTAL_COMPILATION_MESSAGE)
IncrementalCompilationEnvironment( IncrementalCompilationEnvironment(
if (hasFilesInTaskBuildDirectory()) changedFiles else ChangedFiles.Unknown(), changedFiles,
taskBuildDirectory.get().asFile, taskBuildDirectory.get().asFile,
usePreciseJavaTracking = usePreciseJavaTracking, usePreciseJavaTracking = usePreciseJavaTracking,
disableMultiModuleIC = disableMultiModuleIC, disableMultiModuleIC = disableMultiModuleIC,
@@ -745,7 +740,7 @@ abstract class Kotlin2JsCompile @Inject constructor(
val icEnv = if (isIncrementalCompilationEnabled()) { val icEnv = if (isIncrementalCompilationEnabled()) {
logger.info(USING_JS_INCREMENTAL_COMPILATION_MESSAGE) logger.info(USING_JS_INCREMENTAL_COMPILATION_MESSAGE)
IncrementalCompilationEnvironment( IncrementalCompilationEnvironment(
if (hasFilesInTaskBuildDirectory()) changedFiles else ChangedFiles.Unknown(), changedFiles,
taskBuildDirectory.get().asFile, taskBuildDirectory.get().asFile,
multiModuleICSettings = multiModuleICSettings multiModuleICSettings = multiModuleICSettings
) )