azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix warnings in kotlinTargetPresets.kt

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-08 21:55:31 +01:00
committed by Space Team
parent 85f7dd1c20
commit 3586f624a3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt
+3 -2
View File
@@ -9,7 +9,6 @@ import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.DeprecatedTargetPresetApi import org.jetbrains.kotlin.gradle.DeprecatedTargetPresetApi
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.targets.android.internal.InternalKotlinTargetPreset import org.jetbrains.kotlin.gradle.targets.android.internal.InternalKotlinTargetPreset
import org.jetbrains.kotlin.gradle.targets.runKotlinTargetSideEffects
@DeprecatedTargetPresetApi @DeprecatedTargetPresetApi
abstract class KotlinOnlyTargetPreset<R : KotlinOnlyTarget<T>, T : KotlinCompilation<*>>( abstract class KotlinOnlyTargetPreset<R : KotlinOnlyTarget<T>, T : KotlinCompilation<*>>(
@@ -27,13 +26,15 @@ abstract class KotlinOnlyTargetPreset<R : KotlinOnlyTarget<T>, T : KotlinCompila
// This function is used in IDE import in order to override sourceSetName // This function is used in IDE import in order to override sourceSetName
protected open fun overrideDisambiguationClassifierOnIdeImport(name: String): String? = null 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 { override fun createTargetInternal(name: String): R {
val result = instantiateTarget(name).apply { val result = instantiateTarget(name).apply {
targetName = name targetName = name
disambiguationClassifier = provideTargetDisambiguationClassifier(this@apply) disambiguationClassifier = provideTargetDisambiguationClassifier(this@apply)
@Suppress("DEPRECATION")
useDisambiguationClassifierAsSourceSetNamePrefix = useDisambiguationClassifierAsSourceSetNamePrefix() useDisambiguationClassifierAsSourceSetNamePrefix = useDisambiguationClassifierAsSourceSetNamePrefix()
@Suppress("DEPRECATION")
overrideDisambiguationClassifierOnIdeImport = overrideDisambiguationClassifierOnIdeImport(name) overrideDisambiguationClassifierOnIdeImport = overrideDisambiguationClassifierOnIdeImport(name)
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
preset = this@KotlinOnlyTargetPreset preset = this@KotlinOnlyTargetPreset