From 9f5a02dc7adb8c584d8f37e8c2ee7158e911664d Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Mon, 16 Dec 2019 11:23:40 +0300 Subject: [PATCH] gradle.kts importing: fix as36 --- .../gradle/importing/KotlinDslScriptModelProvider.kt.as36 | 2 +- .../gradle/importing/KotlinDslScriptModelResolver.kt.as36 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as36 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as36 index 3e6697a02d4..8083e3fcdb3 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as36 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as36 @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.configuration +package org.jetbrains.kotlin.idea.scripting.gradle.importing import org.gradle.tooling.BuildController import org.gradle.tooling.model.idea.IdeaModule diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as36 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as36 index 5f422832a17..5ed81b18524 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as36 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as36 @@ -3,9 +3,8 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.configuration.importing +package org.jetbrains.kotlin.idea.scripting.gradle.importing -import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModelProvider import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.project.ProjectData import org.gradle.tooling.model.idea.IdeaProject @@ -13,7 +12,7 @@ import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { - override fun getModelProvider() = KotlinDslScriptModelProvider() + override fun getExtraModelProvider() = KotlinDslScriptModelProvider() override fun requiresTaskRunning() = true override fun populateProjectExtraModels(gradleProject: IdeaProject, ideProject: DataNode) {