From b5ff063164eb29e5dd58fc1acb1440119ad171ba Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Wed, 31 Aug 2022 16:39:18 +0200 Subject: [PATCH] [Gradle] Make jvmMainClasses depend on javaCompile task ^KT-31459 Verification Pending --- .../kotlin/gradle/plugin/KotlinTargetConfigurator.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt index e12dcbfe067..5b0cbaf4648 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt @@ -149,10 +149,15 @@ 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(project.provider { + it.inputs.files({ // the task may not be registered at this point, reference it lazily compilation.compileKotlinTaskProvider.map { it.outputs.files } }) + + if (compilation is KotlinJvmCompilation && compilation.target.withJavaEnabled) { + it.inputs.files({ compilation.compileJavaTaskProvider?.map { it.outputs.files } }) + } + it.inputs.files(compilation.output.resourcesDirProvider) } compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName))