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

Fix double call to get files from FileCollection

Browse Source 
^KT-54588 Fixed
This commit is contained in:
Yahor Berdnikau
2023-01-24 16:11:46 +01:00
committed by Space Team
parent fda4ff177d
commit 8fcea399f9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+3 -2
View File
@@ -715,6 +715,7 @@ abstract class KotlinCompile @Inject constructor(
validateKotlinAndJavaHasSameTargetCompatibility(args) validateKotlinAndJavaHasSameTargetCompatibility(args)
val scriptSources = scriptSources.asFileTree.files val scriptSources = scriptSources.asFileTree.files
val javaSources = javaSources.files
val gradlePrintingMessageCollector = GradlePrintingMessageCollector(logger, args.allWarningsAsErrors,) val gradlePrintingMessageCollector = GradlePrintingMessageCollector(logger, args.allWarningsAsErrors,)
val gradleMessageCollector = GradleErrorMessageCollector(gradlePrintingMessageCollector, kotlinPluginVersion = getKotlinPluginVersion(logger)) val gradleMessageCollector = GradleErrorMessageCollector(gradlePrintingMessageCollector, kotlinPluginVersion = getKotlinPluginVersion(logger))
val outputItemCollector = OutputItemsCollectorImpl() val outputItemCollector = OutputItemsCollectorImpl()
@@ -747,11 +748,11 @@ abstract class KotlinCompile @Inject constructor(
kotlinScriptExtensions = scriptExtensions.get().toTypedArray() kotlinScriptExtensions = scriptExtensions.get().toTypedArray()
) )
logger.info("Kotlin source files: ${kotlinSources.joinToString()}") 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 source files: ${scriptSources.joinToString()}")
logger.info("Script file extensions: ${scriptExtensions.get().joinToString()}") logger.info("Script file extensions: ${scriptExtensions.get().joinToString()}")
compilerRunner.runJvmCompilerAsync( compilerRunner.runJvmCompilerAsync(
(kotlinSources + scriptSources + javaSources.files).toList(), (kotlinSources + scriptSources + javaSources).toList(),
commonSourceSet.toList(), commonSourceSet.toList(),
javaPackagePrefix, javaPackagePrefix,
args, args,