From 01824a336cdb2d777e7c327e958926767fe1f3d3 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 15 Jan 2024 10:41:39 +0100 Subject: [PATCH] [Gradle] Fix warnings in MultiplatformLayoutV2KotlinAndroidSourceSetNaming ^KT-56904 In Progress --- .../MultiplatformLayoutV2KotlinAndroidSourceSetNaming.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/MultiplatformLayoutV2KotlinAndroidSourceSetNaming.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/MultiplatformLayoutV2KotlinAndroidSourceSetNaming.kt index 2f73813b499..517f7ea0dca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/MultiplatformLayoutV2KotlinAndroidSourceSetNaming.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/MultiplatformLayoutV2KotlinAndroidSourceSetNaming.kt @@ -5,10 +5,9 @@ package org.jetbrains.kotlin.gradle.plugin.sources.android -import com.android.build.gradle.api.BaseVariant import org.gradle.api.logging.Logging import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget -import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName +import org.jetbrains.kotlin.gradle.utils.* internal object MultiplatformLayoutV2KotlinAndroidSourceSetNaming : KotlinAndroidSourceSetNaming { private val logger = Logging.getLogger(this::class.java) @@ -29,7 +28,10 @@ internal object MultiplatformLayoutV2KotlinAndroidSourceSetNaming : KotlinAndroi return lowerCamelCaseName(disambiguationClassifier, replaceAndroidBaseSourceSetName(androidSourceSetName, knownType)) } - override fun defaultKotlinSourceSetName(target: KotlinAndroidTarget, variant: BaseVariant): String? { + override fun defaultKotlinSourceSetName( + target: KotlinAndroidTarget, + @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant + ): String? { val kotlinSourceSetName: String? = run { val baseSourceSetName = variant.type.androidBaseSourceSetName ?: return@run null val androidSourceSetName = lowerCamelCaseName(