From 5fd013ef423da503bf510a1c863a031bdf56e725 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 16 Jun 2016 10:22:43 +0200 Subject: [PATCH] minor: rename a field in ScriptTemplateProvider interface --- .../kotlin/script/scriptTemplateProviderExtensionPoint.kt | 4 ++-- .../kotlin/idea/core/script/gradleScriptTemplateProvider.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt index caf1e60f65e..336465f676d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt @@ -30,7 +30,7 @@ interface ScriptTemplateProvider { val isValid: Boolean - val templateClass: String + val templateClassName: String val dependenciesClasspath: Iterable @@ -54,7 +54,7 @@ fun makeScriptDefsFromTemplateProviders(providers: Iterable errorsHandler(it, RuntimeException("Conflicting scriptTemplateProvider ${it.id}, using one with version $ver")) } val loader = URLClassLoader(it.dependenciesClasspath.map { File(it).toURI().toURL() }.toTypedArray(), ScriptTemplateProvider::class.java.classLoader) - val cl = loader.loadClass(it.templateClass) + val cl = loader.loadClass(it.templateClassName) idToVersion.put(it.id, it.version) KotlinScriptDefinitionFromTemplate(cl.kotlin, it.context) } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt index 247234ce4f5..586223c6d9f 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt @@ -30,7 +30,7 @@ class GradleScriptTemplateProvider(project: Project, gim: GradleInstallationMana override val version: Int = 1 override val isValid: Boolean = gradleHome != null - override val templateClass: String = "org.gradle.script.lang.kotlin.KotlinBuildScript" + override val templateClassName: String = "org.gradle.script.lang.kotlin.KotlinBuildScript" override val dependenciesClasspath: Iterable = gradleLibsPath?.listFiles { file -> file.extension == "jar" && depLibsPrefixes.any { file.name.startsWith(it) } } ?.map { it.canonicalPath }