diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/ModuleIR.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/ModuleIR.kt index 0c94c6ac14f..209e083c7ec 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/ModuleIR.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/ModuleIR.kt @@ -64,7 +64,7 @@ data class MultiplatformModuleIR( sourceset.withIrs( irsOfType().filter { dependency -> dependency.dependencyType == sourceset.sourcesetType.toDependencyType() - } + }.map { it.withDependencyType(DependencyType.MAIN) } ) }.listNl(needFirstIndent = false) } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt index 19adf8b86a9..925cac1f4e3 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt @@ -150,7 +150,7 @@ class ModulesToIRsConverter( }.map { it.flatten() + buildFileIr } } - private fun createMultiplatformModule( + private fun ValuesReadingContext.createMultiplatformModule( module: Module, state: ModulesToIrsState ): TaskResult> = with(data) { @@ -180,7 +180,7 @@ class ModulesToIRsConverter( ).asSingletonList().asSuccess() } - private fun createTargetSourceset(target: Module, modulePath: Path): MultiplatformModuleIR { + private fun ValuesReadingContext.createTargetSourceset(target: Module, modulePath: Path): MultiplatformModuleIR { val sourcesetss = target.sourcesets.map { sourceset -> val sourcesetName = target.name + sourceset.sourcesetType.name.capitalize() val sourcesetIrs = buildList { @@ -209,7 +209,7 @@ class ModulesToIRsConverter( return MultiplatformModuleIR( target.name, modulePath, - emptyList(), + with(target.configurator) { createModuleIRs(data, target) }, target.configurator.moduleType, target.template, target,