From 85919c4d62baebb91430e61b5e46278ef6680fc3 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 29 Jun 2023 18:57:24 +0200 Subject: [PATCH] Bump Kotlin/Native version in KGP to 1.9.20-dev-5069 Also, adjust NativeIrLinkerIssuesIT after 5f3dad1. See the explanation below. 5f3dad1 makes -Xlazy-ir-for-caches disabled by default. So the compiler now deserializes different subsets of IR and in different orders. As a result, the error message for a test changes. Both error messages (before and after this commit) are correct, and the selection depends on the IR deserialization strategy. Moreover, this commit changes the expected error message to the initial version, used before -Xlazy-ir-for-caches was introduced. --- build.gradle.kts | 2 +- .../jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index eef902f846d..465885ab7c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -102,7 +102,7 @@ IdeVersionConfigurator.setCurrentIde(project) if (!project.hasProperty("versions.kotlin-native")) { // BEWARE! Bumping this version doesn't take an immediate effect on TeamCity: KTI-1107 - extra["versions.kotlin-native"] = "1.9.20-dev-4192" + extra["versions.kotlin-native"] = "1.9.20-dev-5069" } val irCompilerModules = arrayOf( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt index 58393285e71..9ed55e3c205 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt @@ -205,7 +205,7 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { localRepo = tempDir ) { kotlinNativeCompilerVersion -> """ - |e: The symbol of unexpected type encountered during IR deserialization: IrTypeAliasPublicSymbolImpl, sample.liba/B|null[0]. IrClassifierSymbol is expected. + |e: The symbol of unexpected type encountered during IR deserialization: IrClassPublicSymbolImpl, sample.liba/B|null[0]. IrTypeAliasSymbol is expected. | |This could happen if there are two libraries, where one library was compiled against the different version of the other library than the one currently used in the project. Please check that the project configuration is correct and has consistent versions of dependencies. |