From c8e2888db98d7e16820d508e9c1ae32fa58de04a Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 8 Aug 2022 11:51:59 +0200 Subject: [PATCH] [Gradle][KT-53342] KotlinAndroidSourceSetFactory: Improve error messages --- .../android/KotlinAndroidSourceSetFactory.kt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetFactory.kt index 52d3618eba9..b49383bd6f7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetFactory.kt @@ -39,8 +39,19 @@ internal class KotlinAndroidSourceSetFactory( ): KotlinSourceSet { return kotlin.sourceSets.getOrCreate(name) { kotlinSourceSet -> kotlinSourceSet.androidSourceSetInfoOrNull?.let { info -> - check(info.kotlinSourceSetName == name) { "Bad 'androidSourceSetInfo' on $name: Bad 'kotlinSourceSetName'" } - check(info.androidSourceSetName == androidSourceSet.name) { "Bad 'androidSourceSetInfo' on $name: Bad 'androidSourceSetName'" } + /* Check if kotlinSourceSetName is correct */ + 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 } @@ -57,4 +68,4 @@ internal class KotlinAndroidSourceSetFactory( private companion object { val logger: Logger = Logging.getLogger(KotlinAndroidSourceSetFactory::class.java) } -} \ No newline at end of file +}