From 6dbe547046ad3620920aa5b08209c3dfe25ea561 Mon Sep 17 00:00:00 2001 From: Konstantin Tskhovrebov Date: Fri, 30 Aug 2024 15:05:48 +0200 Subject: [PATCH] [gradle] Fix KMP component publication configuration --- .../compose/resources/MultimoduleResources.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/MultimoduleResources.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/MultimoduleResources.kt index eebd4df8b1a..cfc9f9e19f1 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/MultimoduleResources.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/MultimoduleResources.kt @@ -111,16 +111,18 @@ private fun Project.configureKmpResources( //TODO temporary API misuse. will be changed on the KMP side //https://youtrack.jetbrains.com/issue/KT-70909 val target = compilation.target - val kmpResourceRoot = KotlinTargetResourcesPublication.ResourceRoot( - allCompilationResources, - emptyList(), - emptyList() - ) val kmpEmptyPath = provider { File("") } + val emptyDir = layout.buildDirectory.dir("$RES_GEN_DIR/emptyResourcesDir").map { it.asFile } logger.info("Configure KMP component publication for '${compilation.target.targetName}'") kmpResources.publishResourcesAsKotlinComponent( target, - { kmpResourceRoot }, + { kotlinSourceSet -> + if (kotlinSourceSet == compilation.defaultSourceSet) { + KotlinTargetResourcesPublication.ResourceRoot(allCompilationResources, emptyList(), emptyList()) + } else { + KotlinTargetResourcesPublication.ResourceRoot(emptyDir, emptyList(), emptyList()) + } + }, kmpEmptyPath )