Skip to content

Update kotlin monorepo to v2.3.20 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EdwarDDay merged 3 commits into from
May 23, 2026
Merged

Update kotlin monorepo to v2.3.20 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aab1214
Update kotlin monorepo to v2.3.20
renovate[bot] Mar 16, 2026
4ef88a1
Update kotlin monorepo to v2.3.20
EdwarDDay Mar 30, 2026
9bd5dce
Update kotlin monorepo to v2.3.21
EdwarDDay May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion scripting-definition/src/main/kotlin/ServerScriptConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ internal class ServerScriptConfiguration : ScriptCompilationConfiguration(
ServerScriptDefinition::class,
"kotlin-scripting-dependencies",
"scripting-definition",
"kotlin-stdlib",
)
}
implicitReceivers(ServerScript::class)
Expand Down Expand Up @@ -133,7 +134,7 @@ internal class ServerScriptImportsConfigurator : RefineScriptCompilationConfigur
ResultWithDiagnostics.Failure(diagnostics)
} else {
ScriptCompilationConfiguration(context.compilationConfiguration) {
importScripts(scripts)
if (scripts.isNotEmpty()) importScripts.append(scripts)
}.asSuccess()
}
}
Expand Down
4 changes: 3 additions & 1 deletion scripting-host/src/main/kotlin/RequestState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading