[Gradle][MPP] Rename TransformKotlinGranularMetadata to MetadataDependencyTransformationTask

This, hopefully, finally makes my life easier.

^KT-48135 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-09-14 12:30:26 +02:00
committed by Space
parent a2229758d7
commit 27f7150d48
3 changed files with 11 additions and 6 deletions
@@ -89,7 +89,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
// These tasks currently don't support Configuration Cache and marked as [Task::notCompatibleWithConfigurationCache]
val configCacheIncompatibleTaskTypes = listOf(
"CInteropMetadataDependencyTransformationTask",
"TransformKotlinGranularMetadata"
"MetadataDependencyTransformationTask"
)
build("build", buildOptions = buildOptions) {
@@ -23,7 +23,12 @@ import org.jetbrains.kotlin.gradle.utils.notCompatibleWithConfigurationCache
import java.io.File
import javax.inject.Inject
open class TransformKotlinGranularMetadata
/* Keep typealias for source compatibility */
@Suppress("unused")
@Deprecated("Task was renamed to MetadataDependencyTransformationTask", replaceWith = ReplaceWith("MetadataDependencyTransformationTask"))
typealias TransformKotlinGranularMetadata = MetadataDependencyTransformationTask
open class MetadataDependencyTransformationTask
@Inject constructor(
@get:Internal
@field:Transient
@@ -83,7 +88,7 @@ open class TransformKotlinGranularMetadata
listOf(API_SCOPE, IMPLEMENTATION_SCOPE, COMPILE_ONLY_SCOPE),
lazy {
dependsOnClosureWithInterCompilationDependencies(kotlinSourceSet).map {
project.tasks.withType(TransformKotlinGranularMetadata::class.java)
project.tasks.withType(MetadataDependencyTransformationTask::class.java)
.getByName(KotlinMetadataTargetConfigurator.transformGranularMetadataTaskName(it.name))
.transformation
}
@@ -129,7 +134,7 @@ open class TransformKotlinGranularMetadata
}
internal class SourceSetResolvedMetadataProvider(
taskProvider: TaskProvider<out TransformKotlinGranularMetadata>
taskProvider: TaskProvider<out MetadataDependencyTransformationTask>
) : ResolvedMetadataFilesProvider {
override val buildDependencies: Iterable<TaskProvider<*>> = listOf(taskProvider)
override val metadataResolutions: Iterable<MetadataDependencyResolution> by taskProvider.map { it.metadataDependencyResolutions }
@@ -340,7 +340,7 @@ class KotlinMetadataTargetConfigurator :
val project = compilation.target.project
val sourceSet = compilation.defaultSourceSet
project.registerTask<TransformKotlinGranularMetadata>(
project.registerTask<MetadataDependencyTransformationTask>(
transformGranularMetadataTaskName(compilation.name),
listOf(sourceSet)
) {
@@ -455,7 +455,7 @@ class KotlinMetadataTargetConfigurator :
val resolvedMetadataFilesProviders = lazy {
val transformationTaskHolders = sourceSet.internal.withDependsOnClosure.mapNotNull { hierarchySourceSet ->
project.locateTask<TransformKotlinGranularMetadata>(transformGranularMetadataTaskName(hierarchySourceSet.name))
project.locateTask<MetadataDependencyTransformationTask>(transformGranularMetadataTaskName(hierarchySourceSet.name))
}
transformationTaskHolders.map { SourceSetResolvedMetadataProvider(it) }
}