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

[Gradle][MPP] MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChecker: Don't emit warning on ambiguous SourceSet

Browse Source 
^KT-53709 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-08-25 12:18:12 +02:00
committed by Space
parent 10878e5967
commit 7df34011ec
1 changed files with 8 additions and 0 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/checker/MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChecker.kt
+8
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.plugin.sources.android.KotlinAndroidSourceSetLayout import org.jetbrains.kotlin.gradle.plugin.sources.android.KotlinAndroidSourceSetLayout
import org.jetbrains.kotlin.gradle.plugin.sources.android.androidSourceSetInfo import org.jetbrains.kotlin.gradle.plugin.sources.android.androidSourceSetInfo
import org.jetbrains.kotlin.gradle.plugin.sources.android.multiplatformAndroidSourceSetLayoutV1 import org.jetbrains.kotlin.gradle.plugin.sources.android.multiplatformAndroidSourceSetLayoutV1
import org.jetbrains.kotlin.gradle.utils.androidExtension
import java.io.File import java.io.File
/** /**
@@ -33,6 +34,13 @@ internal object MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChe
/* Layouts did agree on the name of this KotlinSourceSet -> LGTM */ /* Layouts did agree on the name of this KotlinSourceSet -> LGTM */
if (v1kotlinSourceSetName == kotlinSourceSet.name) return if (v1kotlinSourceSetName == kotlinSourceSet.name) return
/*
Detect naming ambiguity of old 'androidTest' like source sets:
If also an android source set with the name of the v1 KotlinSourceSet exists,
then we expect the 'android style source dir usage checker' to warn about this situation.
*/
if (target.project.androidExtension.sourceSets.findByName(v1kotlinSourceSetName) != null) return
val v1KotlinSourceDir = target.project.file("src/$v1kotlinSourceSetName/kotlin") val v1KotlinSourceDir = target.project.file("src/$v1kotlinSourceSetName/kotlin")
if (v1KotlinSourceDir.exists()) { if (v1KotlinSourceDir.exists()) {
diagnosticReporter.warning( diagnosticReporter.warning(