From a66078f2cdd0ee7e172fe1a8cb16f139daa4df3e Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Tue, 24 Sep 2019 13:20:10 +0300 Subject: [PATCH] Let New Gradle project or module wizard rely on platform stepping to avoid inconsistency #KT-33927 Fixed #KT-30685 Fixed #KT-28404 Fixed --- ...otlinGradleAbstractMultiplatformModuleBuilder.kt | 13 ------------- ...nGradleMobileSharedMultiplatformModuleBuilder.kt | 4 ++-- .../KotlinGradleSharedMultiplatformModuleBuilder.kt | 4 ++-- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt index 28f9591bf69..1ce22284b6c 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt @@ -5,15 +5,11 @@ package org.jetbrains.kotlin.idea.configuration -import com.intellij.ide.util.projectWizard.ModuleWizardStep -import com.intellij.ide.util.projectWizard.WizardContext import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager import com.intellij.openapi.externalSystem.model.ProjectSystemId import com.intellij.openapi.externalSystem.model.project.ModuleData -import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.module.Module -import com.intellij.openapi.roots.ui.configuration.ModulesProvider import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.KotlinIcons @@ -23,7 +19,6 @@ import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.TargetSupportException import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder -import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl import org.jetbrains.plugins.gradle.settings.DistributionType import com.intellij.openapi.externalSystem.model.project.ProjectData import org.jetbrains.kotlin.idea.statistics.FUSEventGroups @@ -38,14 +33,6 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( override fun getNodeIcon(): Icon = KotlinIcons.MPP - 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 - ExternalModuleSettingsStep(wizardContext, this, GradleProjectSettingsControl(externalProjectSettings)) - ) - } - private fun setupMppModule(module: Module, parentDir: VirtualFile): VirtualFile? { val moduleDir = parentDir.createChildDirectory(this, mppDirName) val buildGradle = moduleDir.createChildData(null, "build.gradle") diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt index 5136c8c33ea..83c78568311 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt @@ -139,8 +139,8 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM override fun buildMultiPlatformPart(): String { return """ - group 'com.example' - version '0.0.1' + group '${projectId.groupId ?: "com.example"}' + version '${projectId.version ?: "0.0.1"}' apply plugin: 'maven-publish' diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt index 068b21f7d66..525402f3ee7 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt @@ -175,8 +175,8 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl override fun buildMultiPlatformPart(): String { return """ - group 'com.example' - version '0.0.1' + group '${projectId.groupId ?: "com.example"}' + version '${projectId.version ?: "0.0.1"}' apply plugin: 'maven-publish'