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

[Gradle] Fix warnings in MultiplatformLayoutV2KotlinAndroidSourceSetNaming

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-01-15 10:41:39 +01:00
committed by Space Team
parent 5ed28a6a79
commit 01824a336c
1 changed files with 5 additions and 3 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/sources/android/MultiplatformLayoutV2KotlinAndroidSourceSetNaming.kt
+5 -3
View File
@@ -5,10 +5,9 @@
package org.jetbrains.kotlin.gradle.plugin.sources.android package org.jetbrains.kotlin.gradle.plugin.sources.android
import com.android.build.gradle.api.BaseVariant
import org.gradle.api.logging.Logging import org.gradle.api.logging.Logging
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget 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 { internal object MultiplatformLayoutV2KotlinAndroidSourceSetNaming : KotlinAndroidSourceSetNaming {
private val logger = Logging.getLogger(this::class.java) private val logger = Logging.getLogger(this::class.java)
@@ -29,7 +28,10 @@ internal object MultiplatformLayoutV2KotlinAndroidSourceSetNaming : KotlinAndroi
return lowerCamelCaseName(disambiguationClassifier, replaceAndroidBaseSourceSetName(androidSourceSetName, knownType)) 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 kotlinSourceSetName: String? = run {
val baseSourceSetName = variant.type.androidBaseSourceSetName ?: return@run null val baseSourceSetName = variant.type.androidBaseSourceSetName ?: return@run null
val androidSourceSetName = lowerCamelCaseName( val androidSourceSetName = lowerCamelCaseName(