Gradle Project importing: move ModelBuilders and ModelProviders to kotlin-gradle-tooling

^KT-36673 Fixed

idea/idea-gradle/build.gradle.kts

@@ -10,9 +10,6 @@ dependencies {
     compileOnly(project(":idea:idea-jvm"))
     compileOnly(project(":idea:idea-native"))
     compile(project(":idea:kotlin-gradle-tooling"))
-    Platform[193].orLower {
-        compile(project(":idea:idea-gradle-tooling-api"))
-    }
 
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))

idea/idea-gradle/res/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService

@@ -3,4 +3,4 @@
 # Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
 #
 
-org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptTaskModelBuilder
+org.jetbrains.kotlin.gradle.KotlinDslScriptTaskModelBuilder

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt

@@ -9,6 +9,8 @@ import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.project.ProjectData
 import org.gradle.tooling.model.idea.IdeaProject
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
+import org.jetbrains.kotlin.gradle.KotlinDslScriptAdditionalTask
+import org.jetbrains.kotlin.gradle.KotlinDslScriptModelProvider
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
 import org.jetbrains.plugins.gradle.model.Build
 import org.jetbrains.plugins.gradle.model.ClassSetImportModelProvider

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192

@@ -9,6 +9,8 @@ import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.project.ProjectData
 import org.gradle.tooling.model.idea.IdeaProject
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
+import org.jetbrains.kotlin.gradle.KotlinDslScriptAdditionalTask
+import org.jetbrains.kotlin.gradle.KotlinDslScriptModelProvider
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
 import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
 import org.jetbrains.plugins.gradle.model.ClassSetBuildImportModelProvider

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.201

@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.idea.scripting.gradle.importing
 
 import org.jetbrains.plugins.gradle.model.ClassSetImportModelProvider
 import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
+import org.jetbrains.kotlin.gradle.KotlinDslScriptAdditionalTask
+import org.jetbrains.kotlin.gradle.KotlinDslScriptModelProvider
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
 import org.jetbrains.plugins.gradle.service.project.ModifiableGradleProjectModel

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolverCommon.kt

@@ -10,6 +10,7 @@ import com.intellij.openapi.externalSystem.util.Order
 import com.intellij.openapi.util.Pair
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.*
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
+import org.jetbrains.kotlin.gradle.KotlinDslScriptAdditionalTask
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
 
 internal val LOG = Logger.getInstance(KotlinDslScriptModelResolverCommon::class.java)
@@ -20,6 +21,10 @@ abstract class KotlinDslScriptModelResolverCommon : AbstractProjectResolverExten
         return setOf(KotlinDslScriptsModel::class.java)
     }
 
+    override fun getToolingExtensionsClasses(): Set<Class<out Any>> {
+        return setOf(KotlinDslScriptAdditionalTask::class.java)
+    }
+
     override fun getExtraJvmArgs(): List<Pair<String, String>> {
         return listOf(
             Pair(

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScrtiptModelProcessor.kt

@@ -13,6 +13,7 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VfsUtil
 import org.gradle.tooling.model.kotlin.dsl.EditorReportSeverity
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
+import org.jetbrains.kotlin.gradle.BrokenKotlinDslScriptsModel
 import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle
 import org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcher
 import org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptingSupportProvider

idea/kotlin-gradle-tooling/build.gradle.kts

@@ -11,6 +11,9 @@ dependencies {
 
     compileOnly(intellijPluginDep("gradle"))
     compileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") }
+    Platform[193].orLower {
+        compile(project(":idea:idea-gradle-tooling-api"))
+    }
 }
 
 sourceSets {

idea/kotlin-gradle-tooling/src/BrokenKotlinDslScriptsModel.kt

@@ -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.scripting.gradle.importing
+package org.jetbrains.kotlin.gradle
 
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptModel
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel

idea/kotlin-gradle-tooling/src/KotlinDslScriptAdditionalTask.kt

@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.gradle
+
+interface KotlinDslScriptAdditionalTask

idea/kotlin-gradle-tooling/src/KotlinDslScriptModelProvider.kt

@@ -1,9 +1,9 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * 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.scripting.gradle.importing
+package org.jetbrains.kotlin.gradle
 
 import org.gradle.tooling.BuildController
 import org.gradle.tooling.model.Model
@@ -27,7 +27,10 @@ class KotlinDslScriptModelProvider : ProjectImportModelProvider {
                         consumer.consumeProjectModel(it, model, kotlinDslScriptModelClass)
                     }
                 } catch (e: Throwable) {
-                    consumer.consumeProjectModel(it, BrokenKotlinDslScriptsModel(e), kotlinDslScriptModelClass)
+                    consumer.consumeProjectModel(
+                        it,
+                        BrokenKotlinDslScriptsModel(e), kotlinDslScriptModelClass
+                    )
                 }
             }
         }

idea/kotlin-gradle-tooling/src/KotlinDslScriptTaskModelBuilder.kt

@@ -2,17 +2,15 @@
  * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * 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.scripting.gradle.importing
+package org.jetbrains.kotlin.gradle
 
 import org.gradle.api.Project
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.PREPARATION_TASK_NAME
-import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
+import org.gradle.util.GradleVersion
 import org.jetbrains.plugins.gradle.tooling.AbstractModelBuilderService
 import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
 import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext
 
-interface KotlinDslScriptAdditionalTask
-
 class KotlinDslScriptTaskModelBuilder : AbstractModelBuilderService() {
     override fun canBuild(modelName: String): Boolean {
         return KotlinDslScriptAdditionalTask::class.java.name == modelName
@@ -34,4 +32,9 @@ class KotlinDslScriptTaskModelBuilder : AbstractModelBuilderService() {
             project, e, "Kotlin DSL script model errors"
         ).withDescription("Unable to set $PREPARATION_TASK_NAME sync task.")
     }
+
+    private fun kotlinDslScriptsModelImportSupported(currentGradleVersion: String): Boolean {
+        return GradleVersion.version(currentGradleVersion) >= GradleVersion.version("6.0")
+    }
+
 }