From 164d66595cc59fa84a087e6bb126044a46d5ea2f Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Wed, 31 Aug 2022 16:02:27 +0200
Subject: [PATCH] Revert "[Gradle] Make target lifecycle task depend on classes
 compilation outputs"

This reverts commit 564e3b064ab26d67e0248de02828f63753562dc6.
---
 .../jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt | 3 ++-
 1 file changed, 2 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 c000000d96f..e12dcbfe067 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
@@ -151,10 +151,11 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
             it.description = "Assembles outputs for compilation '${compilation.name}' of target '${compilation.target.name}'"
             it.inputs.files(project.provider {
                 // the task may not be registered at this point, reference it lazily
-                compilation.output.classesDirs
+                compilation.compileKotlinTaskProvider.map { it.outputs.files }
             })
             it.inputs.files(compilation.output.resourcesDirProvider)
         }
+        compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName))
     }
 
     override fun defineConfigurationsForTarget(target: KotlinTargetType) {