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

minor: rename a field in ScriptTemplateProvider interface

Browse Source
This commit is contained in:
Ilya Chernikov
2016-06-16 10:22:43 +02:00
committed by Pavel V. Talanov
parent 5bea5bcc37
commit 5fd013ef42
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+2 -2
View File
@@ -30,7 +30,7 @@ interface ScriptTemplateProvider {
val isValid: Boolean val isValid: Boolean
val templateClass: String val templateClassName: String
val dependenciesClasspath: Iterable<String> val dependenciesClasspath: Iterable<String>
@@ -54,7 +54,7 @@ fun makeScriptDefsFromTemplateProviders(providers: Iterable<ScriptTemplateProvid
try { try {
idToVersion.get(it.id)?.let { ver -> errorsHandler(it, RuntimeException("Conflicting scriptTemplateProvider ${it.id}, using one with version $ver")) } idToVersion.get(it.id)?.let { ver -> 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 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) idToVersion.put(it.id, it.version)
KotlinScriptDefinitionFromTemplate(cl.kotlin, it.context) KotlinScriptDefinitionFromTemplate(cl.kotlin, it.context)
} }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt
+1 -1
View File
@@ -30,7 +30,7 @@ class GradleScriptTemplateProvider(project: Project, gim: GradleInstallationMana
override val version: Int = 1 override val version: Int = 1
override val isValid: Boolean = gradleHome != null 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<String> = override val dependenciesClasspath: Iterable<String> =
gradleLibsPath?.listFiles { file -> file.extension == "jar" && depLibsPrefixes.any { file.name.startsWith(it) } } gradleLibsPath?.listFiles { file -> file.extension == "jar" && depLibsPrefixes.any { file.name.startsWith(it) } }
?.map { it.canonicalPath } ?.map { it.canonicalPath }