From dec7f51902c66a5df8fdcf60210765b34f27f977 Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Wed, 30 Oct 2019 00:08:24 +0300 Subject: [PATCH] Return an old stepping cause new one requires a big refactoring for GradleModuleBuilder --- .../KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 index 70f55ec8db2..d99f6180531 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 @@ -23,10 +23,11 @@ import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder import org.jetbrains.plugins.gradle.settings.DistributionType import com.intellij.openapi.externalSystem.model.project.ProjectData +import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep import com.intellij.openapi.roots.ui.configuration.ModulesProvider import org.jetbrains.kotlin.idea.statistics.FUSEventGroups import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger -import org.jetbrains.plugins.gradle.service.project.wizard.GradleStructureWizardStep +import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl import javax.swing.Icon abstract class KotlinGradleAbstractMultiplatformModuleBuilder( @@ -49,14 +50,13 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( this.name = null this.contentEntryPath = null this.moduleFilePath = null - this.projectId = null } override fun createWizardSteps(wizardContext: WizardContext, modulesProvider: ModulesProvider): Array { super.createWizardSteps(wizardContext, modulesProvider) // initializes GradleModuleBuilder.myWizardContext return arrayOf( // Let us have to edit project name only - GradleStructureWizardStep(this, wizardContext) + ExternalModuleSettingsStep(wizardContext, this, GradleProjectSettingsControl(externalProjectSettings)) ) }