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
This commit is contained in:
+5
-2
@@ -152,10 +152,13 @@ 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(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)
|
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) {
|
override fun defineConfigurationsForTarget(target: KotlinTargetType) {
|
||||||
|
|||||||
Reference in New Issue
Block a user