From 8fcea399f913fffe4dd72a4ab10d1cc678f7e9b2 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 24 Jan 2023 16:11:46 +0100 Subject: [PATCH] Fix double call to get files from FileCollection ^KT-54588 Fixed --- .../common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index d87d4624adf..708d1b371e0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -715,6 +715,7 @@ abstract class KotlinCompile @Inject constructor( validateKotlinAndJavaHasSameTargetCompatibility(args) val scriptSources = scriptSources.asFileTree.files + val javaSources = javaSources.files val gradlePrintingMessageCollector = GradlePrintingMessageCollector(logger, args.allWarningsAsErrors,) val gradleMessageCollector = GradleErrorMessageCollector(gradlePrintingMessageCollector, kotlinPluginVersion = getKotlinPluginVersion(logger)) val outputItemCollector = OutputItemsCollectorImpl() @@ -747,11 +748,11 @@ abstract class KotlinCompile @Inject constructor( kotlinScriptExtensions = scriptExtensions.get().toTypedArray() ) logger.info("Kotlin source files: ${kotlinSources.joinToString()}") - logger.info("Java source files: ${javaSources.files.joinToString()}") + logger.info("Java source files: ${javaSources.joinToString()}") logger.info("Script source files: ${scriptSources.joinToString()}") logger.info("Script file extensions: ${scriptExtensions.get().joinToString()}") compilerRunner.runJvmCompilerAsync( - (kotlinSources + scriptSources + javaSources.files).toList(), + (kotlinSources + scriptSources + javaSources).toList(), commonSourceSet.toList(), javaPackagePrefix, args,