azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: do not specify Kotlin version only for Android modules

Browse Source
This commit is contained in:
Ilya Kirillov
2020-03-23 10:30:22 +03:00
parent fd6f7f9a7c
commit 3cd55b7827
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt
+7 -6
View File
@@ -65,12 +65,13 @@ class ModulesToIRsConverter(
fun Writer.createBuildFiles(): TaskResult<List<BuildFileIR>> = with(data) { fun Writer.createBuildFiles(): TaskResult<List<BuildFileIR>> = with(data) {
val needExplicitRootBuildFile = !needFlattening val needExplicitRootBuildFile = !needFlattening
val parentModuleHasTransitivelySpecifiedKotlinVersion = allModules.any { modules -> val initialState = ModulesToIrsState(projectPath, parentModuleHasTransitivelySpecifiedKotlinVersion = false)
modules.configurator == AndroidSinglePlatformModuleConfigurator rootModules.mapSequence { module ->
} val parentModuleHasKotlinVersion = module.configurator == AndroidSinglePlatformModuleConfigurator
val initialState = ModulesToIrsState(projectPath, parentModuleHasTransitivelySpecifiedKotlinVersion) createBuildFileForModule(
rootModules.mapSequence { module,
createBuildFileForModule(it, initialState) initialState.copy(parentModuleHasTransitivelySpecifiedKotlinVersion = parentModuleHasKotlinVersion)
)
}.map { it.flatten() }.map { buildFiles -> }.map { it.flatten() }.map { buildFiles ->
if (needExplicitRootBuildFile) buildFiles + createRootBuildFile() if (needExplicitRootBuildFile) buildFiles + createRootBuildFile()
else buildFiles else buildFiles