diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as40 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as40 index 8083e3fcdb3..022c44fb86a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as40 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as40 @@ -6,32 +6,28 @@ package org.jetbrains.kotlin.idea.scripting.gradle.importing import org.gradle.tooling.BuildController -import org.gradle.tooling.model.idea.IdeaModule -import org.gradle.tooling.model.idea.IdeaProject +import org.gradle.tooling.model.Model +import org.gradle.tooling.model.gradle.GradleBuild import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel -import org.jetbrains.plugins.gradle.model.ProjectImportExtraModelProvider +import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider -class KotlinDslScriptModelProvider : ProjectImportExtraModelProvider { +class KotlinDslScriptModelProvider : ProjectImportModelProvider { private val kotlinDslScriptModelClass: Class<*> = KotlinDslScriptsModel::class.java override fun populateBuildModels( controller: BuildController, - project: IdeaProject, - consumer: ProjectImportExtraModelProvider.BuildModelConsumer + gradleBuild: GradleBuild, + consumer: ProjectImportModelProvider.BuildModelConsumer ) { - project.modules.forEach { module -> - if (module.gradleProject.parent == null) { - val model = controller.findModel(module.gradleProject, kotlinDslScriptModelClass) - if (model != null) { - consumer.consume(module, model, kotlinDslScriptModelClass) - } - } + val model = controller.findModel(gradleBuild.rootProject, kotlinDslScriptModelClass) + if (model != null) { + consumer.consume(gradleBuild, model, kotlinDslScriptModelClass) } } override fun populateProjectModels( controller: BuildController, - module: IdeaModule?, - modelConsumer: ProjectImportExtraModelProvider.ProjectModelConsumer + model: Model, + modelConsumer: ProjectImportModelProvider.ProjectModelConsumer ) = Unit } \ No newline at end of file diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as40 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as40 index 627a569b35b..bf3e89c476a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as40 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as40 @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSup import org.jetbrains.plugins.gradle.model.Build class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { - override fun getExtraModelProvider() = KotlinDslScriptModelProvider() + override fun getModelProvider() = KotlinDslScriptModelProvider() override fun requiresTaskRunning() = true override fun populateProjectExtraModels(gradleProject: IdeaProject, ideProject: DataNode) {