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

Wizard: fix adding dependencies to targets

Browse Source
This commit is contained in:
Ilya Kirillov
2020-01-23 00:35:07 +03:00
parent 3d5007c1a5
commit 217cf3edd1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/ModuleIR.kt
+1 -1
View File
@@ -64,7 +64,7 @@ data class MultiplatformModuleIR(
sourceset.withIrs( sourceset.withIrs(
irsOfType<DependencyIR>().filter { dependency -> irsOfType<DependencyIR>().filter { dependency ->
dependency.dependencyType == sourceset.sourcesetType.toDependencyType() dependency.dependencyType == sourceset.sourcesetType.toDependencyType()
} }.map { it.withDependencyType(DependencyType.MAIN) }
) )
}.listNl(needFirstIndent = false) }.listNl(needFirstIndent = false)
} }
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt
+3 -3
View File
@@ -150,7 +150,7 @@ class ModulesToIRsConverter(
}.map { it.flatten() + buildFileIr } }.map { it.flatten() + buildFileIr }
} }
private fun createMultiplatformModule( private fun ValuesReadingContext.createMultiplatformModule(
module: Module, module: Module,
state: ModulesToIrsState state: ModulesToIrsState
): TaskResult<List<BuildFileIR>> = with(data) { ): TaskResult<List<BuildFileIR>> = with(data) {
@@ -180,7 +180,7 @@ class ModulesToIRsConverter(
).asSingletonList().asSuccess() ).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 sourcesetss = target.sourcesets.map { sourceset ->
val sourcesetName = target.name + sourceset.sourcesetType.name.capitalize() val sourcesetName = target.name + sourceset.sourcesetType.name.capitalize()
val sourcesetIrs = buildList<BuildSystemIR> { val sourcesetIrs = buildList<BuildSystemIR> {
@@ -209,7 +209,7 @@ class ModulesToIRsConverter(
return MultiplatformModuleIR( return MultiplatformModuleIR(
target.name, target.name,
modulePath, modulePath,
emptyList(), with(target.configurator) { createModuleIRs(data, target) },
target.configurator.moduleType, target.configurator.moduleType,
target.template, target.template,
target, target,