diff --git a/build-logic/preprocess-workflows/src/main/groovy/org/spockframework/gradle/DetermineImportedFilesWorkAction.groovy b/build-logic/preprocess-workflows/src/main/groovy/org/spockframework/gradle/DetermineImportedFilesWorkAction.groovy index 5ffdeb16ef..b8981812f1 100644 --- a/build-logic/preprocess-workflows/src/main/groovy/org/spockframework/gradle/DetermineImportedFilesWorkAction.groovy +++ b/build-logic/preprocess-workflows/src/main/groovy/org/spockframework/gradle/DetermineImportedFilesWorkAction.groovy @@ -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 { @Override @@ -41,17 +41,20 @@ abstract class DetermineImportedFilesWorkAction implements WorkAction { 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' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b213cdb040..47c931016f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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"