From 619381e462691b5e1439ac8e92481409f3a74b5e Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Wed, 9 Feb 2022 06:42:58 +0400 Subject: [PATCH] KT-MR-5666 Get the older semantics of compileAllTask & outputs This doesn't suffer from `compilation.allOutputs` not being configurable and follows the previous implementation --- .../kotlin/gradle/plugin/KotlinTargetConfigurator.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt index e8cc0faca62..ef957f2e73c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt @@ -152,10 +152,13 @@ abstract class AbstractKotlinTargetConfigurator project.registerTask(compilation.compileAllTaskName) { it.group = LifecycleBasePlugin.BUILD_GROUP it.description = "Assembles outputs for compilation '${compilation.name}' of target '${compilation.target.name}'" - it.inputs.files(compilation.output.classesDirs) + it.inputs.files(project.provider { + // the task may not be registered at this point, reference it lazily + compilation.compileKotlinTaskProvider.map { it.outputs.files } + }) it.inputs.files(compilation.output.resourcesDirProvider) } - (compilation.output.allOutputs as? ConfigurableFileCollection)?.from(project.files().builtBy(compilation.compileAllTaskName)) + compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName)) } override fun defineConfigurationsForTarget(target: KotlinTargetType) {