From f559533545b319fe729df532efa9753e6f25b20d Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Mon, 17 Apr 2023 15:06:17 +0200 Subject: [PATCH] Bump Kotlin/Native version to 1.9.0-dev-5836 Also, fix KGP IT for linkage error messages: the message text in the presence of compiler caches was changed because of ab89203, and this commit effectively reverts expected message changes made in ebaa09a. --- build.gradle.kts | 2 +- .../gradle/native/NativeIrLinkerIssuesIT.kt | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 53c3986799c..d359f217b4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -101,7 +101,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.0-dev-4844" + extra["versions.kotlin-native"] = "1.9.0-dev-5836" } 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 b38f8a5f790..f16e8b38df6 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 @@ -136,11 +136,9 @@ class NativeIrLinkerIssuesIT : BaseGradleIT() { |Project dependencies: |+--- org.sample:liba (org.sample:liba-native): 2.0 || \--- stdlib: $kotlinNativeCompilerVersion - |+--- org.sample:libb (org.sample:libb-native): 1.0 - || ^^^ This module requires symbol sample.liba/C|null[0]. - || +--- org.sample:liba (org.sample:liba-native): 1.0 -> 2.0 (*) - || \--- stdlib: $kotlinNativeCompilerVersion - |\--- org.jetbrains.kotlin.native.platform.* (NNN libraries): $kotlinNativeCompilerVersion + |\--- org.sample:libb (org.sample:libb-native): 1.0 + | ^^^ This module requires symbol sample.liba/C|null[0]. + | +--- org.sample:liba (org.sample:liba-native): 1.0 -> 2.0 (*) | \--- stdlib: $kotlinNativeCompilerVersion | |(*) - dependencies omitted (listed previously) @@ -198,11 +196,9 @@ class NativeIrLinkerIssuesIT : BaseGradleIT() { |+--- org.sample:liba (org.sample:liba-native): 2.0 || ^^^ This module contains symbol sample.liba/B|null[0] that is the cause of the conflict. || \--- stdlib: $kotlinNativeCompilerVersion - |+--- org.sample:libb (org.sample:libb-native): 1.0 - || +--- org.sample:liba (org.sample:liba-native): 1.0 -> 2.0 (*) - || | ^^^ This module contains symbol sample.liba/B|null[0] that is the cause of the conflict. - || \--- stdlib: $kotlinNativeCompilerVersion - |\--- org.jetbrains.kotlin.native.platform.* (NNN libraries): $kotlinNativeCompilerVersion + |\--- org.sample:libb (org.sample:libb-native): 1.0 + | +--- org.sample:liba (org.sample:liba-native): 1.0 -> 2.0 (*) + | | ^^^ This module contains symbol sample.liba/B|null[0] that is the cause of the conflict. | \--- stdlib: $kotlinNativeCompilerVersion | |(*) - dependencies omitted (listed previously)