From 934cbcbbec9326b72a5349f395c9b51ca55638d0 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 24 Oct 2019 11:31:19 +0300 Subject: [PATCH] Use more abstract class for gradleModuleBuilder In IDEA 201.* another class is in super class list ^KT-34463 Fixed --- .../kotlin/idea/configuration/gradleModuleBuilderUtils.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/gradleModuleBuilderUtils.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/gradleModuleBuilderUtils.kt index d8c74b02269..56177d279a1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/gradleModuleBuilderUtils.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/gradleModuleBuilderUtils.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.configuration import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel import com.intellij.openapi.externalSystem.model.project.ProjectId +import com.intellij.openapi.externalSystem.service.project.wizard.AbstractExternalModuleBuilder import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project import com.intellij.openapi.project.ProjectCoreUtil @@ -30,7 +31,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyFile import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory import java.io.File -internal var Module.gradleModuleBuilder: GradleModuleBuilder? by UserDataProperty(Key.create("GRADLE_MODULE_BUILDER")) +internal var Module.gradleModuleBuilder: AbstractExternalModuleBuilder<*>? by UserDataProperty(Key.create("GRADLE_MODULE_BUILDER")) private var Module.settingsScriptBuilder: SettingsScriptBuilder? by UserDataProperty(Key.create("SETTINGS_SCRIPT_BUILDER")) internal fun findSettingsGradleFile(module: Module): VirtualFile? { @@ -202,7 +203,7 @@ class KotlinGradleFrameworkSupportInModuleConfigurable( val builder = model.moduleBuilder val projectId = (builder as? GradleModuleBuilder)?.projectId ?: ProjectId(null, module.name, null) try { - module.gradleModuleBuilder = builder as? GradleModuleBuilder + module.gradleModuleBuilder = builder as? AbstractExternalModuleBuilder<*> supportProvider.addSupport(projectId, module, rootModel, modifiableModelsProvider, buildScriptData) } finally { flushSettingsGradleCopy(module)