From 6ac76aa3e9605b46f713fb4a5436693cf9449fea Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Thu, 20 Jul 2023 17:00:24 +0200 Subject: [PATCH] Fix passing K2 language version to K1 multimodule tests After splitting K1 and K2 tests some multimodule tests in K1 configuration were still running with 2.0 language version. The reason was in misconfiguration of complex multimodule projects - they don't apply override of compiler arguments. This fix added such arguments update. #KT-60589 Fixed --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 97a22d724d9..e75be40736a 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -457,6 +457,9 @@ abstract class AbstractIncrementalJpsTest( val kotlinFacetSettings = module.kotlinFacetSettings if (kotlinFacetSettings != null) { val compilerArguments = kotlinFacetSettings.compilerArguments + if(compilerArguments != null) { + updateCommandLineArguments(compilerArguments) + } if (compilerArguments is K2MetadataCompilerArguments) { val out = getAbsolutePath("${module.name}/out") File(out).mkdirs()