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

Make JSR 223 examples compatible with embeddable compiler, strip ...

Browse Source 
some dependencies.
Fixes #KT-17561 and related issues
Warning: API changed slightly
This commit is contained in:
Ilya Chernikov
2017-12-19 12:06:11 +01:00
parent d51b17c1b2
commit 2d8e73f3f6
7 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223JvmDaemonCompileScriptEngine.kt
-2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.script.jsr223
import com.intellij.openapi.Disposable
import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector
import org.jetbrains.kotlin.cli.common.repl.*
@@ -37,7 +36,6 @@ import kotlin.reflect.KClass
// TODO: need to manage resources here, i.e. call replCompiler.dispose when engine is collected
class KotlinJsr223JvmDaemonCompileScriptEngine(
disposable: Disposable,
factory: ScriptEngineFactory,
compilerClasspath: List<File>,
templateClasspath: List<File>,
libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223JvmLocalScriptEngine.kt
-3
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.script.jsr223
import com.intellij.openapi.Disposable
import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector
import org.jetbrains.kotlin.cli.common.repl.*
@@ -35,7 +34,6 @@ import javax.script.ScriptEngineFactory
import kotlin.reflect.KClass
class KotlinJsr223JvmLocalScriptEngine(
disposable: Disposable,
factory: ScriptEngineFactory,
val templateClasspath: List<File>,
templateClassName: String,
@@ -45,7 +43,6 @@ class KotlinJsr223JvmLocalScriptEngine(
override val replCompiler: ReplCompiler by lazy {
GenericReplCompiler(
disposable,
makeScriptDefinition(templateClasspath, templateClassName),
makeCompilerConfiguration(),
PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, false))
libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt
-3
View File
@@ -18,7 +18,6 @@
package org.jetbrains.kotlin.script.jsr223
import com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.cli.common.repl.KotlinJsr223JvmScriptEngineFactoryBase
import org.jetbrains.kotlin.cli.common.repl.ScriptArgsWithTypes
import org.jetbrains.kotlin.script.util.*
@@ -30,7 +29,6 @@ class KotlinJsr223JvmLocalScriptEngineFactory : KotlinJsr223JvmScriptEngineFacto
override fun getScriptEngine(): ScriptEngine =
KotlinJsr223JvmLocalScriptEngine(
Disposer.newDisposable(),
this,
scriptCompilationClasspathFromContext("kotlin-script-util.jar"),
KotlinStandardJsr223ScriptTemplate::class.qualifiedName!!,
@@ -43,7 +41,6 @@ class KotlinJsr223JvmDaemonLocalEvalScriptEngineFactory : KotlinJsr223JvmScriptE
override fun getScriptEngine(): ScriptEngine =
KotlinJsr223JvmDaemonCompileScriptEngine(
Disposer.newDisposable(),
this,
KotlinJars.compilerClasspath,
scriptCompilationClasspathFromContext("kotlin-script-util.jar"),