From 59b29dc2b91bb2318581fb1a3ba45a4017beb937 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 9 Aug 2023 15:51:02 +0200 Subject: [PATCH] [Gradle] Update NativeIrLinkerIssuesIT to reflect changes in stdlib ^KT-60901 Verification Pending --- .../gradle/native/NativeIrLinkerIssuesIT.kt | 137 ++++++++++-------- 1 file changed, 75 insertions(+), 62 deletions(-) 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 9ed55e3c205..769cc16f498 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 @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.native import org.gradle.api.logging.LogLevel import org.gradle.util.GradleVersion +import org.jetbrains.kotlin.gradle.KOTLIN_VERSION import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.konan.library.KONAN_PLATFORM_LIBS_NAME_PREFIX @@ -144,11 +145,14 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { | |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 + || +--- stdlib: $kotlinNativeCompilerVersion + || \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION + |+--- 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:kotlin-stdlib: $KOTLIN_VERSION + |\--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION | |(*) - dependencies omitted (listed previously) """.trimMargin() @@ -168,25 +172,28 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { localRepo = tempDir ) { kotlinNativeCompilerVersion -> """ - |e: Module "org.sample:libb (org.sample:libb-native)" has a reference to symbol sample.liba/C|null[0]. Neither the module itself nor its dependencies contain such declaration. - | - |This could happen if the required dependency is missing in the project. Or if there is a dependency of "org.sample:libb (org.sample:libb-native)" that has a different version in the project than the version that "org.sample:libb (org.sample:libb-native): 1.0" was initially compiled with. Please check that the project configuration is correct and has consistent versions of all required dependencies. - | - |The list of "org.sample:libb (org.sample:libb-native): 1.0" dependencies that may lead to conflicts: - |1. "org.sample:liba (org.sample:liba-native): 2.0" (was initially compiled with "org.sample:liba (org.sample:liba-native): 1.0") - | - |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 - | \--- stdlib: $kotlinNativeCompilerVersion - | - |(*) - dependencies omitted (listed previously) - """.trimMargin() + e: Module "org.sample:libb (org.sample:libb-native)" has a reference to symbol sample.liba/C|null[0]. Neither the module itself nor its dependencies contain such declaration. + + This could happen if the required dependency is missing in the project. Or if there is a dependency of "org.sample:libb (org.sample:libb-native)" that has a different version in the project than the version that "org.sample:libb (org.sample:libb-native): 1.0" was initially compiled with. Please check that the project configuration is correct and has consistent versions of all required dependencies. + + The list of "org.sample:libb (org.sample:libb-native): 1.0" dependencies that may lead to conflicts: + 1. "org.sample:liba (org.sample:liba-native): 2.0" (was initially compiled with "org.sample:liba (org.sample:liba-native): 1.0") + + Project dependencies: + +--- org.sample:liba (org.sample:liba-native): 2.0 + | +--- stdlib: $kotlinNativeCompilerVersion + | \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION + +--- 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:kotlin-stdlib: $KOTLIN_VERSION + +--- org.jetbrains.kotlin.native.platform.* (NNN libraries): $kotlinNativeCompilerVersion + | \--- stdlib: $kotlinNativeCompilerVersion + \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION + + (*) - dependencies omitted (listed previously) + """.trimIndent() } } @@ -205,24 +212,27 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { localRepo = tempDir ) { kotlinNativeCompilerVersion -> """ - |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. - | - |The list of libraries that depend on "org.sample:liba (org.sample:liba-native)" and may lead to conflicts: - |1. "org.sample:libb (org.sample:libb-native): 1.0" (was compiled against "org.sample:liba (org.sample:liba-native): 1.0" but "org.sample:liba (org.sample:liba-native): 2.0" is used in the project) - | - |Project dependencies: - |+--- 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 - | - |(*) - dependencies omitted (listed previously) - """.trimMargin() + 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. + + The list of libraries that depend on "org.sample:liba (org.sample:liba-native)" and may lead to conflicts: + 1. "org.sample:libb (org.sample:libb-native): 1.0" (was compiled against "org.sample:liba (org.sample:liba-native): 1.0" but "org.sample:liba (org.sample:liba-native): 2.0" is used in the project) + + Project dependencies: + +--- 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.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION + +--- 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:kotlin-stdlib: $KOTLIN_VERSION + \--- org.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION + + (*) - dependencies omitted (listed previously) + """.trimIndent() } } @@ -239,26 +249,29 @@ 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. - | - |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. - | - |The list of libraries that depend on "org.sample:liba (org.sample:liba-native)" and may lead to conflicts: - |1. "org.sample:libb (org.sample:libb-native): 1.0" (was compiled against "org.sample:liba (org.sample:liba-native): 1.0" but "org.sample:liba (org.sample:liba-native): 2.0" is used in the project) - | - |Project dependencies: - |+--- 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 - | \--- stdlib: $kotlinNativeCompilerVersion - | - |(*) - dependencies omitted (listed previously) - """.trimMargin() + 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. + + The list of libraries that depend on "org.sample:liba (org.sample:liba-native)" and may lead to conflicts: + 1. "org.sample:libb (org.sample:libb-native): 1.0" (was compiled against "org.sample:liba (org.sample:liba-native): 1.0" but "org.sample:liba (org.sample:liba-native): 2.0" is used in the project) + + Project dependencies: + +--- 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.jetbrains.kotlin:kotlin-stdlib: $KOTLIN_VERSION + +--- 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:kotlin-stdlib: $KOTLIN_VERSION + +--- org.jetbrains.kotlin.native.platform.* (NNN libraries): $kotlinNativeCompilerVersion + | \--- stdlib: $kotlinNativeCompilerVersion + \--- org.jetbrains.kotlin:kotlin-stdlib: ${KOTLIN_VERSION} + + (*) - dependencies omitted (listed previously) + """.trimIndent() } }