From 27f7150d484db5e31f7715b76b203aa930956568 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 14 Sep 2022 12:30:26 +0200 Subject: [PATCH] [Gradle][MPP] Rename TransformKotlinGranularMetadata to MetadataDependencyTransformationTask This, hopefully, finally makes my life easier. ^KT-48135 Verification Pending --- .../jetbrains/kotlin/gradle/ConfigurationCacheIT.kt | 2 +- ...ata.kt => MetadataDependencyTransformationTask.kt} | 11 ++++++++--- .../metadata/KotlinMetadataTargetConfigurator.kt | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/{TransformKotlinGranularMetadata.kt => MetadataDependencyTransformationTask.kt} (92%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt index 889527ef7a4..80d36400a5a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt @@ -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) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/TransformKotlinGranularMetadata.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTask.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/TransformKotlinGranularMetadata.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTask.kt index 505b188753d..2a6986b12e9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/TransformKotlinGranularMetadata.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTask.kt @@ -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 + taskProvider: TaskProvider ) : ResolvedMetadataFilesProvider { override val buildDependencies: Iterable> = listOf(taskProvider) override val metadataResolutions: Iterable by taskProvider.map { it.metadataDependencyResolutions } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt index e43607cc9bf..38a9d25932b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt @@ -340,7 +340,7 @@ class KotlinMetadataTargetConfigurator : val project = compilation.target.project val sourceSet = compilation.defaultSourceSet - project.registerTask( + project.registerTask( transformGranularMetadataTaskName(compilation.name), listOf(sourceSet) ) { @@ -455,7 +455,7 @@ class KotlinMetadataTargetConfigurator : val resolvedMetadataFilesProviders = lazy { val transformationTaskHolders = sourceSet.internal.withDependsOnClosure.mapNotNull { hierarchySourceSet -> - project.locateTask(transformGranularMetadataTaskName(hierarchySourceSet.name)) + project.locateTask(transformGranularMetadataTaskName(hierarchySourceSet.name)) } transformationTaskHolders.map { SourceSetResolvedMetadataProvider(it) } }