From 3cd55b7827041b3678e4ded2a8b185840706ff3e Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 23 Mar 2020 10:30:22 +0300
Subject: [PATCH] Wizard: do not specify Kotlin version only for Android
 modules

---
 .../plugins/kotlin/ModulesToIRsConverter.kt         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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<List<BuildFileIR>> = 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