From 59dc546a54704a2c4cc29403e6d370ea0da0f2a4 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 16 May 2019 15:29:08 +0200 Subject: [PATCH] Convert JvmGetScriptingClass to object to simplify (de)serialization --- .../experimental/jvm/jvmScriptingHostConfiguration.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt index 49d9753c3d0..20142789777 100644 --- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt +++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt @@ -6,6 +6,7 @@ package kotlin.script.experimental.jvm import java.io.File +import java.io.Serializable import java.net.URLClassLoader import kotlin.reflect.KClass import kotlin.script.experimental.api.* @@ -30,10 +31,10 @@ val ScriptingHostConfigurationKeys.jvm val defaultJvmScriptingHostConfiguration get() = ScriptingHostConfiguration { - getScriptingClass(JvmGetScriptingClass()) + getScriptingClass(JvmGetScriptingClass) } -class JvmGetScriptingClass : GetScriptingClass { +object JvmGetScriptingClass : GetScriptingClass, Serializable { private var dependencies: List? = null private var classLoader: ClassLoader? = null @@ -89,4 +90,7 @@ class JvmGetScriptingClass : GetScriptingClass { throw IllegalArgumentException("unable to load class $classType", e) } } + + @JvmStatic + private val serialVersionUID = 1L }