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

Implement context classpath extraction using particular class,...

Browse Source 
Use it in the main-kts.
Also improve diagnoistics related to the definition loading.

#KT-26828 fixed (after this commit - finally, see also another related commit)
This commit is contained in:
Ilya Chernikov
2018-09-14 17:08:29 +02:00
parent d9760f00f6
commit d760299dc1
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/scriptDef.kt
+2 -2
View File
@@ -16,6 +16,7 @@ import kotlin.script.experimental.api.*
import kotlin.script.experimental.jvm.JvmDependency
import kotlin.script.experimental.jvm.compat.mapLegacyDiagnosticSeverity
import kotlin.script.experimental.jvm.compat.mapLegacyScriptPosition
import kotlin.script.experimental.jvm.dependenciesFromClassContext
import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
import kotlin.script.experimental.jvm.jvm
@@ -27,9 +28,8 @@ object MainKtsScriptDefinition : ScriptCompilationConfiguration(
{
defaultImports(DependsOn::class, Repository::class)
jvm {
dependenciesFromCurrentContext("kotlin-main-kts")
dependenciesFromClassContext(MainKtsScriptDefinition::class, "kotlin-main-kts")
}
// variant: dependencies(collectDependenciesFromCurrentContext(...
refineConfiguration {
onAnnotations(DependsOn::class, Repository::class, handler = MainKtsConfigurator())
}