diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5625344..2f34f5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -burst = "2.11.0" +burst = "2.12.2" changelog = "2.5.0" clikt = "5.1.0" intellij-platform = "2.10.5" -kotlin = "2.3.10" +kotlin = "2.3.21" kotlinx-coroutines = "1.11.0" logback = "1.5.32" oshai-logging = "8.0.03" diff --git a/scripting-definition/src/main/kotlin/ServerScriptConfiguration.kt b/scripting-definition/src/main/kotlin/ServerScriptConfiguration.kt index 398a77b..46d6db1 100644 --- a/scripting-definition/src/main/kotlin/ServerScriptConfiguration.kt +++ b/scripting-definition/src/main/kotlin/ServerScriptConfiguration.kt @@ -64,6 +64,7 @@ internal class ServerScriptConfiguration : ScriptCompilationConfiguration( ServerScriptDefinition::class, "kotlin-scripting-dependencies", "scripting-definition", + "kotlin-stdlib", ) } implicitReceivers(ServerScript::class) @@ -133,7 +134,7 @@ internal class ServerScriptImportsConfigurator : RefineScriptCompilationConfigur ResultWithDiagnostics.Failure(diagnostics) } else { ScriptCompilationConfiguration(context.compilationConfiguration) { - importScripts(scripts) + if (scripts.isNotEmpty()) importScripts.append(scripts) }.asSuccess() } } diff --git a/scripting-host/src/main/kotlin/RequestState.kt b/scripting-host/src/main/kotlin/RequestState.kt index a962cf2..879a29a 100644 --- a/scripting-host/src/main/kotlin/RequestState.kt +++ b/scripting-host/src/main/kotlin/RequestState.kt @@ -47,7 +47,9 @@ import java.nio.file.Path as NioPath private val logger = KotlinLogging.logger {} -private val scriptingHost = BasicJvmScriptingHost() +// revert back from legacy usage +// https://youtrack.jetbrains.com/issue/KT-86352/K2-scripting-FirResolvedTypeRef-exception-when-resolving-extension-functions-from-imported-scripts +private val scriptingHost = BasicJvmScriptingHost.createLegacy() class RequestState( record: FCGIRecord.BeginRequest,