[Gradle][KT-53342] KotlinAndroidSourceSetFactory: Improve error messages
This commit is contained in:
committed by
Space
parent
f1a54dfeba
commit
c8e2888db9
+14
-3
@@ -39,8 +39,19 @@ internal class KotlinAndroidSourceSetFactory(
|
|||||||
): KotlinSourceSet {
|
): KotlinSourceSet {
|
||||||
return kotlin.sourceSets.getOrCreate(name) { kotlinSourceSet ->
|
return kotlin.sourceSets.getOrCreate(name) { kotlinSourceSet ->
|
||||||
kotlinSourceSet.androidSourceSetInfoOrNull?.let { info ->
|
kotlinSourceSet.androidSourceSetInfoOrNull?.let { info ->
|
||||||
check(info.kotlinSourceSetName == name) { "Bad 'androidSourceSetInfo' on $name: Bad 'kotlinSourceSetName'" }
|
/* Check if kotlinSourceSetName is correct */
|
||||||
check(info.androidSourceSetName == androidSourceSet.name) { "Bad 'androidSourceSetInfo' on $name: Bad 'androidSourceSetName'" }
|
check(info.kotlinSourceSetName == name) {
|
||||||
|
"Bad 'androidSourceSetInfo.kotlinSourceSetName' on KotlinSourceSet:$name: " +
|
||||||
|
"Expected: ${kotlinSourceSet.name} " +
|
||||||
|
"Found: ${info.kotlinSourceSetName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Check if androidSourceSetName is correct */
|
||||||
|
check(info.androidSourceSetName == androidSourceSet.name) {
|
||||||
|
"Bad 'androidSourceSetInfo.androidSourceSetName' on KotlinSourceSet:$name: " +
|
||||||
|
"Expected: ${androidSourceSet.name} " +
|
||||||
|
"Found: ${info.androidSourceSetName}"
|
||||||
|
}
|
||||||
return@getOrCreate
|
return@getOrCreate
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,4 +68,4 @@ internal class KotlinAndroidSourceSetFactory(
|
|||||||
private companion object {
|
private companion object {
|
||||||
val logger: Logger = Logging.getLogger(KotlinAndroidSourceSetFactory::class.java)
|
val logger: Logger = Logging.getLogger(KotlinAndroidSourceSetFactory::class.java)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user