From e53602e763c1094830d721d41f0fd16aef805f81 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 7 Feb 2022 19:00:09 +0300
Subject: [PATCH] [stdlib-mpp] use stdlib-mpp dependency instead of stdlib in
 kotlin-test projects

#KT-56106
---
 libraries/kotlin.test/annotations-common/build.gradle | 2 +-
 libraries/kotlin.test/common/build.gradle             | 2 +-
 libraries/kotlin.test/js-ir/build.gradle.kts          | 5 +----
 libraries/kotlin.test/js/build.gradle                 | 2 +-
 libraries/kotlin.test/jvm/build.gradle                | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle
index e1e31914ba3..c4b2246fd45 100644
--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-platform-common'
 JvmToolchain.updateJvmTarget(project, "1.8")
 
 dependencies {
-    api RepoDependencies.kotlinStdlib(project, "common")
+    api RepoDependencies.kotlinStdlib(project, "mpp")
     testApi project(":kotlin-test:kotlin-test-common")
 }
 
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index 4014c19b194..e58d8991b77 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-platform-common'
 JvmToolchain.updateJvmTarget(project, "1.8")
 
 dependencies {
-    api RepoDependencies.kotlinStdlib(project, "common")
+    api RepoDependencies.kotlinStdlib(project, "mpp")
     testApi project(":kotlin-test:kotlin-test-annotations-common")
 }
 
diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts
index 5a811e4555b..ed80b91eba3 100644
--- a/libraries/kotlin.test/js-ir/build.gradle.kts
+++ b/libraries/kotlin.test/js-ir/build.gradle.kts
@@ -30,7 +30,7 @@ kotlin {
     sourceSets {
         named("commonMain") {
             dependencies {
-                api(project(":kotlin-stdlib-js-ir"))
+                api(kotlinStdlib("mpp"))
             }
             kotlin.srcDir(commonMainSources.get().destinationDir)
         }
@@ -38,9 +38,6 @@ kotlin {
             kotlin.srcDir(commonTestSources.get().destinationDir)
         }
         named("jsMain") {
-            dependencies {
-                api(project(":kotlin-stdlib-js-ir"))
-            }
             kotlin.srcDir(jsMainSources.get().destinationDir)
         }
     }
diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index 7a7c385165b..ed26ba24232 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -10,7 +10,7 @@ configurations {
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-common')
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    api RepoDependencies.kotlinStdlib(project, "js")
+    api RepoDependencies.kotlinStdlib(project, "mpp")
 }
 
 compileKotlin2Js {
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 5775d0caa55..618f0a480d9 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -16,7 +16,7 @@ sourceSets {
 
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-common')
-    api(RepoDependencies.kotlinStdlib(project))
+    api(RepoDependencies.kotlinStdlib(project, "mpp"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testApi('junit:junit:4.13.2')
 }