Skip to content

Update kotlin monorepo to v2.4.21 #2367

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
leonard84 merged 5 commits into from
Oct 8, 2026
Merged

Update kotlin monorepo to v2.4.21 #2367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75c59cc
Update kotlin monorepo to v2.4.20
renovate[bot] Oct 7, 2026
f9f9b61
Adapt workflow preprocessing to Kotlin 2.4
leonard84 Oct 8, 2026
bfa7afc
Properly adapt workflow preprocessing to Kotlin 2.4
Vampire Oct 8, 2026
3a437ae
Merge branch 'master' into renovate/kotlin-monorepo
leonard84 Oct 8, 2026
6ade086
Update Kotlin to 2.4.21
Vampire Oct 8, 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
33 changes: 18 additions & 15 deletions ...rkflows/src/main/groovy/org/spockframework/gradle/DetermineImportedFilesWorkAction.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFileProperty
import org.gradle.workers.WorkAction
import org.gradle.workers.WorkParameters
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.IdeaStandaloneExecutionSetup
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreApplicationEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreApplicationEnvironmentMode.Production
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.parsing.KotlinParserDefinition
import org.jetbrains.kotlin.com.intellij.openapi.vfs.local.CoreLocalFileSystem
import org.jetbrains.kotlin.com.intellij.openapi.vfs.local.CoreLocalVirtualFile
import org.jetbrains.kotlin.com.intellij.psi.PsiManager
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtLiteralStringTemplateEntry
import org.jetbrains.kotlin.psi.KtStringTemplateExpression

import static org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles.JVM_CONFIG_FILES
import static org.jetbrains.kotlin.config.CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY

@CompileStatic
abstract class DetermineImportedFilesWorkAction implements WorkAction<Parameters> {
@Override
Expand All @@ -41,17 +41,20 @@ abstract class DetermineImportedFilesWorkAction implements WorkAction<Parameters
return []
}

def disposable = Disposer.newDisposable()
IdeaStandaloneExecutionSetup.INSTANCE.doSetup()
return PsiManager
.getInstance(
KotlinCoreEnvironment
.createForProduction(
Disposer.newDisposable(),
new CompilerConfiguration().tap {
it.put(MESSAGE_COLLECTOR_KEY, MessageCollector.@Companion.NONE)
},
JVM_CONFIG_FILES
)
.project
new KotlinCoreProjectEnvironment(
disposable,
KotlinCoreApplicationEnvironment.@Companion.create(
disposable,
Production.INSTANCE
).tap {
registerParserDefinition(new KotlinParserDefinition())
registerFileType(KotlinFileType.INSTANCE, 'kts')
}
).project
)
.findFile(
new CoreLocalVirtualFile(
Expand Down
6 changes: 2 additions & 4 deletions ...cess-workflows/src/main/groovy/org/spockframework/gradle/PreprocessWorkflowsPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ class PreprocessWorkflowsPlugin implements Plugin<Project> {
libs.findLibrary('workflows-kotlin-scriptingCompiler').orElseThrow(AssertionError::new).get()
)
def mainKtsClasspath = project.configurations.detachedConfiguration(
libs.findLibrary('workflows-kotlin-mainKts').orElseThrow(AssertionError::new).get()
).tap {
it.transitive = false
}
libs.findLibrary('workflows-kotlin-mainKts').orElseThrow(AssertionError::new).get(),
)

def preprocessWorkflows = project.tasks.register('preprocessWorkflows') {
it.group = 'github workflows'
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ junitPlatformVersionRange = "[1.12,7)"
asm = '9.10.1'
mockito4 = '4.11.0'
mockito5 = '5.24.0'
workflows-kotlin = "2.3.21"
workflows-kotlin = "2.4.21"

[libraries]
jetbrains-annotations = "org.jetbrains:annotations:26.1.0"
Expand Down
Loading