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 1156feeb002..21b6604d74f 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 @@ -65,12 +65,13 @@ class ModulesToIRsConverter( fun Writer.createBuildFiles(): TaskResult> = with(data) { val needExplicitRootBuildFile = !needFlattening - val parentModuleHasTransitivelySpecifiedKotlinVersion = allModules.any { modules -> - modules.configurator == AndroidSinglePlatformModuleConfigurator - } - val initialState = ModulesToIrsState(projectPath, parentModuleHasTransitivelySpecifiedKotlinVersion) - rootModules.mapSequence { - createBuildFileForModule(it, initialState) + val initialState = ModulesToIrsState(projectPath, parentModuleHasTransitivelySpecifiedKotlinVersion = false) + rootModules.mapSequence { module -> + val parentModuleHasKotlinVersion = module.configurator == AndroidSinglePlatformModuleConfigurator + createBuildFileForModule( + module, + initialState.copy(parentModuleHasTransitivelySpecifiedKotlinVersion = parentModuleHasKotlinVersion) + ) }.map { it.flatten() }.map { buildFiles -> if (needExplicitRootBuildFile) buildFiles + createRootBuildFile() else buildFiles