From a15c068471fa4c192346596e75d34330b1388206 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 18 Oct 2023 12:05:28 +0200 Subject: [PATCH] [Gradle] Implement DeprecatedMppGradlePropertiesMigrationSetupAction KT-61634 --- ... => DeprecatedMppGradlePropertiesMigrationSetupAction.kt} | 5 +++-- .../kotlin/gradle/plugin/registerKotlinPluginExtensions.kt | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/{deprecationDiagnostics.kt => DeprecatedMppGradlePropertiesMigrationSetupAction.kt} (94%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/deprecationDiagnostics.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/DeprecatedMppGradlePropertiesMigrationSetupAction.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/deprecationDiagnostics.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/DeprecatedMppGradlePropertiesMigrationSetupAction.kt index 8c36642b81a..25b7215db2c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/deprecationDiagnostics.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/DeprecatedMppGradlePropertiesMigrationSetupAction.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.gradle.api.Project +import org.jetbrains.kotlin.gradle.plugin.KotlinProjectSetupAction import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPropertiesProvider import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_COMPATIBILITY_METADATA_VARIANT import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_GRANULAR_SOURCE_SETS_METADATA @@ -15,10 +16,10 @@ import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLI import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics import org.jetbrains.kotlin.gradle.plugin.diagnostics.kotlinToolingDiagnosticsCollector -internal fun runDeprecationDiagnostics(project: Project) { +internal val DeprecatedMppGradlePropertiesMigrationSetupAction = KotlinProjectSetupAction { checkAndReportDeprecatedMppProperties(project) handleHierarchicalStructureFlagsMigration(project) - } +} /** * Declared properties have to be captured during plugin application phase before the HMPP migration util sets them. diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt index d33bb99789a..d246bb474a7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.MultiplatformPublishingSetupAction import org.jetbrains.kotlin.gradle.plugin.mpp.SyncLanguageSettingsWithKotlinExtensionSetupAction import org.jetbrains.kotlin.gradle.plugin.mpp.UserDefinedAttributesSetupAction import org.jetbrains.kotlin.gradle.plugin.mpp.apple.AddBuildListenerForXCodeSetupAction +import org.jetbrains.kotlin.gradle.plugin.mpp.internal.DeprecatedMppGradlePropertiesMigrationSetupAction import org.jetbrains.kotlin.gradle.plugin.sources.KotlinMultiplatformSourceSetSetupAction import org.jetbrains.kotlin.gradle.plugin.sources.LanguageSettingsSetupAction import org.jetbrains.kotlin.gradle.plugin.statistics.MultiplatformBuildStatsReportSetupAction @@ -68,6 +69,7 @@ internal fun Project.registerKotlinPluginExtensions() { } if (isMultiplatform) { + register(project, DeprecatedMppGradlePropertiesMigrationSetupAction) register(project, KotlinMultiplatformTargetPresetAction) register(project, KotlinMultiplatformSourceSetSetupAction) register(project, MultiplatformBuildStatsReportSetupAction)