azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update template(s) provider interface to support multiple templates, rename it appropriately

Browse Source
This commit is contained in:
Ilya Chernikov
2016-08-08 16:06:02 +02:00
parent 6c0b78fb01
commit c9441bd7b3
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt
+3 -3
View File
@@ -23,13 +23,13 @@ import com.intellij.openapi.project.Project
import org.gradle.tooling.ProjectConnection
import org.jetbrains.kotlin.lexer.KotlinLexer
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.script.ScriptTemplateProvider
import org.jetbrains.kotlin.script.ScriptTemplatesProvider
import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper
import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings
import java.io.File
import java.util.*
class GradleScriptTemplateProvider(project: Project): ScriptTemplateProvider {
class GradleScriptTemplateProvider(project: Project): ScriptTemplatesProvider {
private val gradleExeSettings: GradleExecutionSettings? by lazy {
try {
@@ -62,7 +62,7 @@ class GradleScriptTemplateProvider(project: Project): ScriptTemplateProvider {
override val version: Int = 1
override val isValid: Boolean get() = gradleExeSettings?.gradleHome != null
override val templateClassName: String = "org.gradle.script.lang.kotlin.KotlinBuildScript"
override val templateClassNames: Iterable<String> = listOf("org.gradle.script.lang.kotlin.KotlinBuildScript")
override val dependenciesClasspath: Iterable<String> by lazy {
gradleExeSettings?.gradleHome?.let { File(it, "lib") }
?.let { if (it.exists()) it else null }