From 02df7a7d4ca5b43bc8cc0300983401169e758ebc Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 26 Oct 2022 10:18:25 +0200 Subject: [PATCH] [Gradle] KotlinCompileConfig: Respect moduleName from parentKotlinOptions ^KT-54312 Verification Pending --- .../gradle/tasks/configuration/KotlinCompileConfig.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt index a557b335a68..385b5883abf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt @@ -76,7 +76,11 @@ internal open class BaseKotlinCompileConfig : AbstractKotl task.associatedJavaCompileTaskName.value(javaTaskProvider.name) } - task.ownModuleName.value(compilationProjection.ownModuleName) + task.ownModuleName.value( + providers.provider { + @Suppress("DEPRECATION") + task.parentKotlinOptions.orNull?.moduleName ?: compilationProjection.ownModuleName + }) } } }