From 3586f624a3aa86809c728a1d9b456de1d8ae846d Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 8 Feb 2024 21:55:31 +0100 Subject: [PATCH] [Gradle] Fix warnings in kotlinTargetPresets.kt ^KT-56904 In Progress --- .../kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt index 668dbb4cd55..90019db17c7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt @@ -9,7 +9,6 @@ import org.gradle.api.Project import org.jetbrains.kotlin.gradle.DeprecatedTargetPresetApi import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.targets.android.internal.InternalKotlinTargetPreset -import org.jetbrains.kotlin.gradle.targets.runKotlinTargetSideEffects @DeprecatedTargetPresetApi abstract class KotlinOnlyTargetPreset, T : KotlinCompilation<*>>( @@ -27,13 +26,15 @@ abstract class KotlinOnlyTargetPreset, T : KotlinCompila // This function is used in IDE import in order to override sourceSetName protected open fun overrideDisambiguationClassifierOnIdeImport(name: String): String? = null - abstract protected fun instantiateTarget(name: String): R + protected abstract fun instantiateTarget(name: String): R override fun createTargetInternal(name: String): R { val result = instantiateTarget(name).apply { targetName = name disambiguationClassifier = provideTargetDisambiguationClassifier(this@apply) + @Suppress("DEPRECATION") useDisambiguationClassifierAsSourceSetNamePrefix = useDisambiguationClassifierAsSourceSetNamePrefix() + @Suppress("DEPRECATION") overrideDisambiguationClassifierOnIdeImport = overrideDisambiguationClassifierOnIdeImport(name) @Suppress("DEPRECATION") preset = this@KotlinOnlyTargetPreset