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

Rename: dependenciesClasspath -> templateClasspath

Browse Source 
Clearer distinction from additionalResolverClasspath
This commit is contained in:
Pavel V. Talanov
2017-07-14 19:02:20 +03:00
parent 96d8f685e9
commit aacb9a437a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+2 -2
View File
@@ -42,7 +42,7 @@ interface ScriptTemplatesProvider {
val filePattern: String? get() = null
val dependenciesClasspath: List<File>
val templateClasspath: List<File>
// TODO: need to provide a way to specify this in compiler/repl .. etc
/*
@@ -83,7 +83,7 @@ fun makeScriptDefsFromTemplatesProviders(providers: Iterable<ScriptTemplatesProv
}
private fun createClassLoader(provider: ScriptTemplatesProvider): ClassLoader {
val classpath = provider.dependenciesClasspath + provider.additionalResolverClasspath
val classpath = provider.templateClasspath + provider.additionalResolverClasspath
LOG.info("[kts] loading script definitions ${provider.templateClassNames} using cp: ${classpath.joinToString(File.pathSeparator)}")
val baseLoader = ScriptTemplatesProvider::class.java.classLoader
return if (classpath.isEmpty()) baseLoader else URLClassLoader(classpath.map { it.toURI().toURL() }.toTypedArray(), baseLoader)