From ec5af74d075a97c3f65fc9959393ad986021dc77 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Fri, 21 Jul 2023 12:13:32 +0300 Subject: [PATCH] [Kotlin] Update test data for enabled target hierarchy KTIJ-25063 GitOrigin-RevId: c5798b0846d0ab3d9e521762cec661d334aeb3e2 --- .../KotlinMppMiscCasesImportingTests.kt | 1 + .../dependencies-old-import.txt | 18 +++++++ .../dependencies.txt | 48 +++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/plugins/kotlin/gradle/multiplatform-tests/test/org/jetbrains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppMiscCasesImportingTests.kt b/plugins/kotlin/gradle/multiplatform-tests/test/org/jetbrains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppMiscCasesImportingTests.kt index 0c9cedfb461e..1886deecbc1b 100644 --- a/plugins/kotlin/gradle/multiplatform-tests/test/org/jetbrains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppMiscCasesImportingTests.kt +++ b/plugins/kotlin/gradle/multiplatform-tests/test/org/jetbrains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppMiscCasesImportingTests.kt @@ -190,6 +190,7 @@ class KotlinMppMiscCasesImportingTests : AbstractKotlinMppGradleImportingTest() @Test @TestMetadata("projectDependenciesToMppProjectWithAdditionalCompilations") + @PluginTargetVersions(pluginVersion = "1.9.20-dev-6845+") fun `testProjectDependenciesToMppProjectWithAdditionalCompilations - KGP dependency resolution disabled`() { doTest { testClassifier = "old-import" diff --git a/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies-old-import.txt b/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies-old-import.txt index 3238dc115275..76b4c346c77e 100644 --- a/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies-old-import.txt +++ b/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies-old-import.txt @@ -13,6 +13,12 @@ root.clientJvm.test root.clientMpp +root.clientMpp.appleMain + libMpp.commonMain (COMPILE) + +root.clientMpp.appleTest + libMpp.commonMain (TEST) + root.clientMpp.commonMain libMpp.commonMain (COMPILE) @@ -27,6 +33,12 @@ root.clientMpp.iosArm64Test libMpp.commonMain (TEST) libMpp.iosArm64Main (TEST) +root.clientMpp.iosMain + libMpp.commonMain (COMPILE) + +root.clientMpp.iosTest + libMpp.commonMain (TEST) + root.clientMpp.jvmMain libMpp.commonMain (COMPILE) libMpp.jvmAdditionalNonTest (COMPILE) @@ -37,6 +49,12 @@ root.clientMpp.jvmTest libMpp.jvmAdditionalNonTest (TEST) libMpp.jvmMain (TEST) +root.clientMpp.nativeMain + libMpp.commonMain (COMPILE) + +root.clientMpp.nativeTest + libMpp.commonMain (TEST) + Test configuration: - showing only modules matching .*client.* diff --git a/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies.txt b/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies.txt index 7410f96b2c68..b15548b2bc4f 100644 --- a/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies.txt +++ b/plugins/kotlin/idea/tests/testData/gradle/multiplatform/core/features/misc/projectDependenciesToMppProjectWithAdditionalCompilations/dependencies.txt @@ -13,6 +13,20 @@ root.clientJvm.test root.clientMpp +root.clientMpp.appleMain + libMpp.appleMain (COMPILE) + libMpp.commonMain (COMPILE) + libMpp.iosArm64Main (COMPILE) + libMpp.iosMain (COMPILE) + libMpp.nativeMain (COMPILE) + +root.clientMpp.appleTest + libMpp.appleMain (TEST) + libMpp.commonMain (TEST) + libMpp.iosArm64Main (TEST) + libMpp.iosMain (TEST) + libMpp.nativeMain (TEST) + root.clientMpp.commonMain libMpp.commonMain (COMPILE) @@ -20,12 +34,32 @@ root.clientMpp.commonTest libMpp.commonMain (TEST) root.clientMpp.iosArm64Main + libMpp.appleMain (COMPILE) libMpp.commonMain (COMPILE) libMpp.iosArm64Main (COMPILE) + libMpp.iosMain (COMPILE) + libMpp.nativeMain (COMPILE) root.clientMpp.iosArm64Test + libMpp.appleMain (TEST) libMpp.commonMain (TEST) libMpp.iosArm64Main (TEST) + libMpp.iosMain (TEST) + libMpp.nativeMain (TEST) + +root.clientMpp.iosMain + libMpp.appleMain (COMPILE) + libMpp.commonMain (COMPILE) + libMpp.iosArm64Main (COMPILE) + libMpp.iosMain (COMPILE) + libMpp.nativeMain (COMPILE) + +root.clientMpp.iosTest + libMpp.appleMain (TEST) + libMpp.commonMain (TEST) + libMpp.iosArm64Main (TEST) + libMpp.iosMain (TEST) + libMpp.nativeMain (TEST) root.clientMpp.jvmMain libMpp.jvmAdditionalNonTest (COMPILE) @@ -33,6 +67,20 @@ root.clientMpp.jvmMain root.clientMpp.jvmTest libMpp.jvmAdditionalNonTest (TEST) +root.clientMpp.nativeMain + libMpp.appleMain (COMPILE) + libMpp.commonMain (COMPILE) + libMpp.iosArm64Main (COMPILE) + libMpp.iosMain (COMPILE) + libMpp.nativeMain (COMPILE) + +root.clientMpp.nativeTest + libMpp.appleMain (TEST) + libMpp.commonMain (TEST) + libMpp.iosArm64Main (TEST) + libMpp.iosMain (TEST) + libMpp.nativeMain (TEST) + Test configuration: - showing only modules matching .*client.*