From 9794c4459f9cb3dd3e198f1c85cc4dc6d23d2b3e Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Fri, 17 Feb 2023 17:43:56 +0100 Subject: [PATCH] [kt, tests] Update jvmAndAndroid tests Suspicious changes, needs investigation, esp. differences between *Binary and *Source versions ^KT-56571 GitOrigin-RevId: 87cf3a541bd6961e99d59803c1c95c16436d259a --- .../jvmAndAndroidBinary/dependencies.txt | 18 ++++++++---------- .../jvmAndAndroidBinary/facets-7.5.1.txt | 6 +++--- .../kotlin/test/consumer_commonTest_usages.kt | 2 +- .../jvmAndAndroidSource/dependencies.txt | 15 ++++++--------- .../jvmAndAndroidSource/facets-7.5.1.txt | 6 +++--- 5 files changed, 21 insertions(+), 26 deletions(-) diff --git a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/dependencies.txt b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/dependencies.txt index 921b99e6ce1b..d10575722f6a 100644 --- a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/dependencies.txt +++ b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/dependencies.txt @@ -17,6 +17,7 @@ project.consumer.androidTest project.consumer.commonMain org.jetbrains.kotlin.mpp.tests:producer-jvm:1.0 (COMPILE) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) @@ -29,15 +30,19 @@ project.consumer.commonTest consumer.commonMain (friend, TEST) consumer.jvmAndAndroidMain (TEST) org.jetbrains.kotlin.mpp.tests:producer-jvm:1.0 (TEST) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (TEST) org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (TEST) org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (TEST) org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (TEST) org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.2 (TEST) + org.jetbrains.kotlinx:kotlinx-coroutines-core:commonMain:1.6.2 (TEST) + org.jetbrains.kotlinx:kotlinx-coroutines-core:concurrentMain:1.6.2 (TEST) org.jetbrains:annotations:13.0 (TEST) project.consumer.jvmAndAndroidMain consumer.commonMain (refines, COMPILE) org.jetbrains.kotlin.mpp.tests:producer-jvm:1.0 (COMPILE) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) @@ -103,22 +108,15 @@ project.producer.androidTest producer.main (friend, TEST) project.producer.commonMain - org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) - org.jetbrains:annotations:13.0 (COMPILE) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) project.producer.commonTest - org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (TEST) - org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (TEST) - org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (TEST) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (TEST) producer.commonMain (friend, TEST) producer.jvmAndAndroidMain (TEST) project.producer.jvmAndAndroidMain - org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) producer.commonMain (refines, COMPILE) project.producer.jvmMain diff --git a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/facets-7.5.1.txt b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/facets-7.5.1.txt index be1fa6e1fd22..b5e35c061bd7 100644 --- a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/facets-7.5.1.txt +++ b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidBinary/facets-7.5.1.txt @@ -80,14 +80,14 @@ project.producer.androidTest project.producer.commonMain externalProjectId = :producer languageLevel = {{LATEST_STABLE}} - apiLevel = {{LATEST_STABLE}} + apiLevel = 1.8 mppVersion = M3 targetPlatform = JVM (1.8) project.producer.commonTest externalProjectId = :producer languageLevel = {{LATEST_STABLE}} - apiLevel = {{LATEST_STABLE}} + apiLevel = 1.8 mppVersion = M3 additionalVisibleModuleNames = :producer:commonMain, :producer:jvmAndAndroidMain targetPlatform = JVM (1.8) @@ -95,7 +95,7 @@ project.producer.commonTest project.producer.jvmAndAndroidMain externalProjectId = :producer languageLevel = {{LATEST_STABLE}} - apiLevel = {{LATEST_STABLE}} + apiLevel = 1.8 mppVersion = M3 dependsOnModuleNames = :producer:commonMain targetPlatform = JVM (1.8) diff --git a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/consumer/src/commonTest/kotlin/test/consumer_commonTest_usages.kt b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/consumer/src/commonTest/kotlin/test/consumer_commonTest_usages.kt index 2c0a4e308099..bc417a7a5108 100644 --- a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/consumer/src/commonTest/kotlin/test/consumer_commonTest_usages.kt +++ b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/consumer/src/commonTest/kotlin/test/consumer_commonTest_usages.kt @@ -3,5 +3,5 @@ package test fun useCommonTest() { // Known issue useJvmAndAndroidMain() - useJvmMain() + useJvmMain() } diff --git a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/dependencies.txt b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/dependencies.txt index f87ee9e24498..07beda7b2ef2 100644 --- a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/dependencies.txt +++ b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/dependencies.txt @@ -18,6 +18,7 @@ project.consumer.androidTest producer.main (TEST) project.consumer.commonMain + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) @@ -31,6 +32,7 @@ project.consumer.commonMain project.consumer.commonTest consumer.commonMain (friend, TEST) consumer.jvmAndAndroidMain (TEST) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (TEST) org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (TEST) org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (TEST) org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (TEST) @@ -43,6 +45,7 @@ project.consumer.commonTest project.consumer.jvmAndAndroidMain consumer.commonMain (refines, COMPILE) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) @@ -118,21 +121,15 @@ project.producer.androidTest producer.main (friend, TEST) project.producer.commonMain - org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) project.producer.commonTest - org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (TEST) - org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (TEST) - org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (TEST) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (TEST) producer.commonMain (friend, TEST) producer.jvmAndAndroidMain (TEST) project.producer.jvmAndAndroidMain - org.jetbrains.kotlin:kotlin-stdlib-jdk7:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib-jdk8:{{KGP_VERSION}} (COMPILE) - org.jetbrains.kotlin:kotlin-stdlib:{{KGP_VERSION}} (COMPILE) + org.jetbrains.kotlin:kotlin-stdlib-common:{{KGP_VERSION}} (COMPILE) producer.commonMain (refines, COMPILE) project.producer.jvmMain diff --git a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/facets-7.5.1.txt b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/facets-7.5.1.txt index be1fa6e1fd22..b5e35c061bd7 100644 --- a/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/facets-7.5.1.txt +++ b/plugins/kotlin/idea/tests/testData/gradle/newMppTests/experimentalTier/jvmAndAndroidSource/facets-7.5.1.txt @@ -80,14 +80,14 @@ project.producer.androidTest project.producer.commonMain externalProjectId = :producer languageLevel = {{LATEST_STABLE}} - apiLevel = {{LATEST_STABLE}} + apiLevel = 1.8 mppVersion = M3 targetPlatform = JVM (1.8) project.producer.commonTest externalProjectId = :producer languageLevel = {{LATEST_STABLE}} - apiLevel = {{LATEST_STABLE}} + apiLevel = 1.8 mppVersion = M3 additionalVisibleModuleNames = :producer:commonMain, :producer:jvmAndAndroidMain targetPlatform = JVM (1.8) @@ -95,7 +95,7 @@ project.producer.commonTest project.producer.jvmAndAndroidMain externalProjectId = :producer languageLevel = {{LATEST_STABLE}} - apiLevel = {{LATEST_STABLE}} + apiLevel = 1.8 mppVersion = M3 dependsOnModuleNames = :producer:commonMain targetPlatform = JVM (1.8)