Let New Gradle project or module wizard rely on platform stepping to avoid inconsistency #KT-33927 Fixed #KT-30685 Fixed #KT-28404 Fixed
This commit is contained in:
-13
@@ -5,15 +5,11 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
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.ExternalSystemModulePropertyManager
|
||||||
import com.intellij.openapi.externalSystem.model.ProjectSystemId
|
import com.intellij.openapi.externalSystem.model.ProjectSystemId
|
||||||
import com.intellij.openapi.externalSystem.model.project.ModuleData
|
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.externalSystem.util.ExternalSystemApiUtil
|
||||||
import com.intellij.openapi.module.Module
|
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.VfsUtil
|
||||||
import com.intellij.openapi.vfs.VirtualFile
|
import com.intellij.openapi.vfs.VirtualFile
|
||||||
import org.jetbrains.kotlin.idea.KotlinIcons
|
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.kotlin.konan.target.TargetSupportException
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
||||||
import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder
|
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 org.jetbrains.plugins.gradle.settings.DistributionType
|
||||||
import com.intellij.openapi.externalSystem.model.project.ProjectData
|
import com.intellij.openapi.externalSystem.model.project.ProjectData
|
||||||
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
|
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
|
||||||
@@ -38,14 +33,6 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
|
|||||||
|
|
||||||
override fun getNodeIcon(): Icon = KotlinIcons.MPP
|
override fun getNodeIcon(): Icon = KotlinIcons.MPP
|
||||||
|
|
||||||
override fun createWizardSteps(wizardContext: WizardContext, modulesProvider: ModulesProvider): Array<ModuleWizardStep> {
|
|
||||||
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? {
|
private fun setupMppModule(module: Module, parentDir: VirtualFile): VirtualFile? {
|
||||||
val moduleDir = parentDir.createChildDirectory(this, mppDirName)
|
val moduleDir = parentDir.createChildDirectory(this, mppDirName)
|
||||||
val buildGradle = moduleDir.createChildData(null, "build.gradle")
|
val buildGradle = moduleDir.createChildData(null, "build.gradle")
|
||||||
|
|||||||
+2
-2
@@ -139,8 +139,8 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM
|
|||||||
|
|
||||||
override fun buildMultiPlatformPart(): String {
|
override fun buildMultiPlatformPart(): String {
|
||||||
return """
|
return """
|
||||||
group 'com.example'
|
group '${projectId.groupId ?: "com.example"}'
|
||||||
version '0.0.1'
|
version '${projectId.version ?: "0.0.1"}'
|
||||||
|
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -175,8 +175,8 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
|
|||||||
|
|
||||||
override fun buildMultiPlatformPart(): String {
|
override fun buildMultiPlatformPart(): String {
|
||||||
return """
|
return """
|
||||||
group 'com.example'
|
group '${projectId.groupId ?: "com.example"}'
|
||||||
version '0.0.1'
|
version '${projectId.version ?: "0.0.1"}'
|
||||||
|
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user