From cb374248314bac29813e74ec3ebaff50a8ae055a Mon Sep 17 00:00:00 2001 From: "konstantin.tskhovrebov" Date: Tue, 16 Nov 2021 18:40:02 +0100 Subject: [PATCH] Update K/N to "1.6.20-dev-5356". --- build.gradle.kts | 2 +- .../jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 70dec664fe3..a33854e4504 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -147,7 +147,7 @@ extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion extra["versions.ktor-network"] = "1.0.1" if (!project.hasProperty("versions.kotlin-native")) { - extra["versions.kotlin-native"] = "1.6.20-dev-320" + extra["versions.kotlin-native"] = "1.6.20-dev-5356" } val useJvmFir by extra(project.kotlinBuildProperties.useFir) 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 652a9f5eac3..155c19373bd 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 @@ -36,7 +36,7 @@ class NativeIrLinkerIssuesIT : BaseGradleIT() { useCache = true ) { kotlinNativeCompilerVersion -> """ - |e: The symbol of unexpected type encountered during IR deserialization: IrClassPublicSymbolImpl, kotlinx.coroutines/CancellationException|null[0]. IrTypeAliasSymbol is expected. + |e: The symbol of unexpected type encountered during IR deserialization: IrTypeAliasPublicSymbolImpl, kotlinx.coroutines/CancellationException|null[0]. IrClassifierSymbol 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. | @@ -175,7 +175,7 @@ class NativeIrLinkerIssuesIT : BaseGradleIT() { useCache = true ) { kotlinNativeCompilerVersion -> """ - |e: The symbol of unexpected type encountered during IR deserialization: IrClassPublicSymbolImpl, sample.liba/B|null[0]. IrTypeAliasSymbol is expected. + |e: The symbol of unexpected type encountered during IR deserialization: IrTypeAliasPublicSymbolImpl, sample.liba/B|null[0]. IrClassifierSymbol 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. |