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

Use renamed Gradle Kotlin DSL template in the provider when available

Browse Source
This commit is contained in:
Ilya Chernikov
2017-06-22 11:36:57 +02:00
parent bf09d91e80
commit ebcac3dd01
1 changed files with 15 additions and 1 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 → idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt
+15 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.script.ScriptTemplatesProvider
import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper
import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings
import java.io.File import java.io.File
import java.net.URLClassLoader
import java.util.* import java.util.*
class GradleScriptTemplatesProvider(project: Project): ScriptTemplatesProvider { class GradleScriptTemplatesProvider(project: Project): ScriptTemplatesProvider {
@@ -57,7 +58,20 @@ class GradleScriptTemplatesProvider(project: Project): ScriptTemplatesProvider {
override val id: String = "Gradle" override val id: String = "Gradle"
override val isValid: Boolean get() = gradleExeSettings?.gradleHome != null override val isValid: Boolean get() = gradleExeSettings?.gradleHome != null
override val templateClassNames: Iterable<String> = listOf("org.gradle.script.lang.kotlin.KotlinBuildScript") override val templateClassNames: Iterable<String> by lazy {
val loader = URLClassLoader(dependenciesClasspath.map { File(it).toURI().toURL() }.toTypedArray(), ScriptTemplatesProvider::class.java.classLoader)
val tpl = listOf("org.gradle.kotlin.dsl.KotlinBuildScript", "org.gradle.script.lang.kotlin.KotlinBuildScript").firstOrNull {
try {
// TODO: consider introducing caching mechanism (e.g. for ScriptDefinition) in ScriptTemplatesProvider to avoid double loading
loader.loadClass(it)
true
}
catch (e: ClassNotFoundException) { false }
catch (e: NoClassDefFoundError) { false }
}
if (tpl != null) listOf(tpl) else emptyList()
}
override val dependenciesClasspath: Iterable<String> by lazy { override val dependenciesClasspath: Iterable<String> by lazy {
gradleExeSettings?.gradleHome?.let { File(it, "lib") } gradleExeSettings?.gradleHome?.let { File(it, "lib") }
?.let { if (it.exists()) it else null } ?.let { if (it.exists()) it else null }