From 1313cffe0181892a757d9643421af9c56c502161 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 25 Apr 2023 10:46:51 +0200 Subject: [PATCH] [Gradle] Schedule 'overrideDisambiguationClassifierOnIdeImport' and 'useDisambiguationClassifierAsSourceSetNamePrefix' for removal in 2.0 ^KT-58220 Verification Pending See: KT-58231 --- .../org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt | 6 ++++++ .../kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt | 2 ++ 2 files changed, 8 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt index 17a0561e728..47a0c2acd28 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt @@ -21,7 +21,13 @@ import org.jetbrains.kotlin.tooling.core.HasMutableExtras interface KotlinTarget : Named, HasAttributes, HasProject, HasMutableExtras { val targetName: String val disambiguationClassifier: String? get() = targetName + + /* Long deprecation cycle, because IDE might be calling into this via reflection */ + @Deprecated("Scheduled for removal with Kotlin 2.2") val useDisambiguationClassifierAsSourceSetNamePrefix: Boolean + + /* Long deprecation cycle, because IDE might be calling into this via reflection */ + @Deprecated("Scheduled for removal with Kotlin 2.2") val overrideDisambiguationClassifierOnIdeImport: String? val platformType: KotlinPlatformType diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt index 433afe12471..98bb041d3ec 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt @@ -44,9 +44,11 @@ abstract class AbstractKotlinTarget( override val defaultConfigurationName: String get() = disambiguateName("default") + @Deprecated("Scheduled for removal with Kotlin 2.2") override var useDisambiguationClassifierAsSourceSetNamePrefix: Boolean = true internal set + @Deprecated("Scheduled for removal with Kotlin 2.2") override var overrideDisambiguationClassifierOnIdeImport: String? = null internal set