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

Improve registering resources tasks in compilations: support laziness

Browse Source
This commit is contained in:
Sergey Igushkin
2021-11-15 22:07:14 +04:00
committed by Space
parent 876ab4ae52
commit 2c6c2c3929
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+9 -8
View File
@@ -17,6 +17,7 @@ import org.gradle.api.attributes.Attribute
import org.gradle.api.attributes.Category import org.gradle.api.attributes.Category
import org.gradle.api.attributes.Usage import org.gradle.api.attributes.Usage
import org.gradle.api.attributes.Usage.USAGE_ATTRIBUTE import org.gradle.api.attributes.Usage.USAGE_ATTRIBUTE
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.internal.artifacts.ArtifactAttributes import org.gradle.api.internal.artifacts.ArtifactAttributes
import org.gradle.api.plugins.BasePlugin import org.gradle.api.plugins.BasePlugin
@@ -135,26 +136,26 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
) { ) {
val project = compilation.target.project val project = compilation.target.project
project.locateOrRegisterTask<ProcessResources>(compilation.processResourcesTaskName) { resourcesTask -> val resourcesDestinationDir = project.file(compilation.output.resourcesDir)
val resourcesTask = project.locateOrRegisterTask<ProcessResources>(compilation.processResourcesTaskName) { resourcesTask ->
resourcesTask.description = "Processes $resourceSet." resourcesTask.description = "Processes $resourceSet."
resourcesTask.from(resourceSet) resourcesTask.from(resourceSet)
resourcesTask.into(project.file(compilation.output.resourcesDir)) resourcesTask.into(resourcesDestinationDir)
} }
compilation.output.resourcesDirProvider = resourcesTask.map { resourcesDestinationDir }
} }
protected fun createLifecycleTask(compilation: KotlinCompilation<*>) { protected fun createLifecycleTask(compilation: KotlinCompilation<*>) {
val project = compilation.target.project val project = compilation.target.project
compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName))
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.dependsOn(compilation.compileKotlinTaskName) it.inputs.files(compilation.output.classesDirs)
if (compilation is KotlinCompilationWithResources) { it.inputs.files(compilation.output.resourcesDirProvider)
it.dependsOn(compilation.processResourcesTaskName)
}
} }
(compilation.output.allOutputs as? ConfigurableFileCollection)?.from(project.files().builtBy(compilation.compileAllTaskName))
} }
override fun defineConfigurationsForTarget(target: KotlinTargetType) { override fun defineConfigurationsForTarget(target: KotlinTargetType) {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilationOutputs.kt
+2 -2
View File
@@ -19,9 +19,9 @@ class DefaultKotlinCompilationOutput(
override val classesDirs: ConfigurableFileCollection = project.files() override val classesDirs: ConfigurableFileCollection = project.files()
override val allOutputs = project.files().apply { override val allOutputs: ConfigurableFileCollection = project.files().apply {
from(classesDirs) from(classesDirs)
from(Callable { resourcesDir }) from(Callable { resourcesDirProvider })
} }
override val resourcesDir: File override val resourcesDir: File
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/FragmentSourcesProvider.kt
+1 -1
View File
@@ -55,7 +55,7 @@ open class LifecycleTasksManager(private val project: Project) {
open fun registerClassesTask(compilationData: KotlinCompilationData<*>) = with(project) { open fun registerClassesTask(compilationData: KotlinCompilationData<*>) = with(project) {
val classesTaskName = compilationData.compileAllTaskName val classesTaskName = compilationData.compileAllTaskName
val classesTask = project.tasks.register(classesTaskName) { classesTask -> val classesTask = project.tasks.register(classesTaskName) { classesTask ->
classesTask.dependsOn(compilationData.output.allOutputs) classesTask.inputs.files(compilationData.output.allOutputs)
} }
project.tasks.named(LifecycleBasePlugin.BUILD_TASK_NAME).configure { it.dependsOn(classesTask) } project.tasks.named(LifecycleBasePlugin.BUILD_TASK_NAME).configure { it.dependsOn(classesTask) }
} }