minor: rename a field in ScriptTemplateProvider interface
This commit is contained in:
committed by
Pavel V. Talanov
parent
5bea5bcc37
commit
5fd013ef42
+2
-2
@@ -30,7 +30,7 @@ interface ScriptTemplateProvider {
|
||||
|
||||
val isValid: Boolean
|
||||
|
||||
val templateClass: String
|
||||
val templateClassName: String
|
||||
|
||||
val dependenciesClasspath: Iterable<String>
|
||||
|
||||
@@ -54,7 +54,7 @@ fun makeScriptDefsFromTemplateProviders(providers: Iterable<ScriptTemplateProvid
|
||||
try {
|
||||
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 cl = loader.loadClass(it.templateClass)
|
||||
val cl = loader.loadClass(it.templateClassName)
|
||||
idToVersion.put(it.id, it.version)
|
||||
KotlinScriptDefinitionFromTemplate(cl.kotlin, it.context)
|
||||
}
|
||||
|
||||
+1
-1
@@ -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<String> =
|
||||
gradleLibsPath?.listFiles { file -> file.extension == "jar" && depLibsPrefixes.any { file.name.startsWith(it) } }
|
||||
?.map { it.canonicalPath }
|
||||
|
||||
Reference in New Issue
Block a user