azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Maven tests for K2

Browse Source 
1) Update test data according to K2 compiler output
2) Finally switch logic of choosing compiler runner depends on language version instead of deprecated useK2 flag

#KT-60859 Fixed
This commit is contained in:
Aleksei.Cherepanov
2023-08-09 22:22:42 +02:00
committed by Space Team
parent e7ff1d4cd9
commit 39a0829f39
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/CompilerRunnerUtils.kt
+2 -1
View File
@@ -50,7 +50,8 @@ fun makeJvmIncrementally(
val buildReporter = BuildReporter(icReporter = reporter, buildMetricsReporter = DoNothingBuildMetricsReporter)
withIncrementalCompilation(args) {
val useK2 = args.useK2 || LanguageVersion.fromVersionString(args.languageVersion)?.usesK2 == true
val languageVersion = LanguageVersion.fromVersionString(args.languageVersion) ?: LanguageVersion.LATEST_STABLE
val useK2 = languageVersion.usesK2
val compiler =
if (useK2 && args.useFirIC && args.useFirLT /* TODO by @Ilya.Chernikov: move LT check into runner */)
IncrementalFirJvmCompilerRunner(