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

[Gradle] Make jvmMainClasses depend on javaCompile task

Browse Source 
^KT-31459 Verification Pending
This commit is contained in:
Anton Lakotka
2022-08-31 16:39:18 +02:00
committed by Space
parent 164d66595c
commit b5ff063164
1 changed files with 6 additions and 1 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/plugin/KotlinTargetConfigurator.kt
+6 -1
View File
@@ -149,10 +149,15 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
project.registerTask<DefaultTask>(compilation.compileAllTaskName) { project.registerTask<DefaultTask>(compilation.compileAllTaskName) {
it.group = LifecycleBasePlugin.BUILD_GROUP it.group = LifecycleBasePlugin.BUILD_GROUP
it.description = "Assembles outputs for compilation '${compilation.name}' of target '${compilation.target.name}'" 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 // the task may not be registered at this point, reference it lazily
compilation.compileKotlinTaskProvider.map { it.outputs.files } 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) it.inputs.files(compilation.output.resourcesDirProvider)
} }
compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName)) compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName))