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

[Gradle] Fix warnings in MultiplatformLayoutV2DefaultManifestLocationConfigurator

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-01-19 21:14:54 +01:00
committed by Space Team
parent cfc48c6e94
commit 3036b408ff
1 changed files with 6 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/sources/android/configurator/MultiplatformLayoutV2DefaultManifestLocationConfigurator.kt
+6 -2
View File
@@ -5,16 +5,20 @@
package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator
import com.android.build.gradle.api.AndroidSourceSet
import org.gradle.api.logging.Logging import org.gradle.api.logging.Logging
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.utils.*
internal object MultiplatformLayoutV2DefaultManifestLocationConfigurator : KotlinAndroidSourceSetConfigurator { internal object MultiplatformLayoutV2DefaultManifestLocationConfigurator : KotlinAndroidSourceSetConfigurator {
private const val DEFAULT_FILE_NAME = "AndroidManifest.xml" private const val DEFAULT_FILE_NAME = "AndroidManifest.xml"
private val logger = Logging.getLogger(javaClass) private val logger = Logging.getLogger(javaClass)
override fun configure(target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, androidSourceSet: AndroidSourceSet) { override fun configure(
target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
) {
val defaultManifestLocation = target.project.file("src/${androidSourceSet.name}/$DEFAULT_FILE_NAME") val defaultManifestLocation = target.project.file("src/${androidSourceSet.name}/$DEFAULT_FILE_NAME")
if (androidSourceSet.manifest.srcFile != defaultManifestLocation) { if (androidSourceSet.manifest.srcFile != defaultManifestLocation) {
logger.debug( logger.debug(