From 35bca103eb1b0d035a655dbedf991b65bef57800 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 16 Aug 2023 03:34:12 +0200
Subject: [PATCH] [stdlib-mpp] Single dependency on stdlib in commonMain

In this project it's required to declare stdlib dependency explicitly,
but now it can be a single line in commonMain
---
 .../tools/benchmarksAnalyzer/build.gradle      | 18 ++----------------
 .../tools/performance-server/build.gradle.kts  |  3 +--
 .../performance-server/ui/build.gradle.kts     |  5 +----
 .../plugin-annotations/build.gradle.kts        |  8 +-------
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/kotlin-native/tools/benchmarksAnalyzer/build.gradle b/kotlin-native/tools/benchmarksAnalyzer/build.gradle
index 651f4a0fa53..691eb2b5ae3 100644
--- a/kotlin-native/tools/benchmarksAnalyzer/build.gradle
+++ b/kotlin-native/tools/benchmarksAnalyzer/build.gradle
@@ -50,7 +50,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion"
+                implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
             }
             kotlin.srcDir '../benchmarks/shared/src'
             kotlin.srcDir 'src/main/kotlin'
@@ -58,21 +58,13 @@ kotlin {
         }
         commonTest {
             dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion"
-                implementation "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion"
+                implementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
             }
             kotlin.srcDir 'src/tests'
         }
         jvmTest {
-            dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
-                implementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-            }
         }
         jsTest {
-            dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion"
-            }
         }
         nativeMain {
             dependsOn commonMain
@@ -80,16 +72,10 @@ kotlin {
             kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-native'
         }
         jvmMain {
-            dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-            }
             kotlin.srcDir 'src/main/kotlin-jvm'
             kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-jvm'
         }
         jsMain {
-            dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion"
-            }
             kotlin.srcDir 'src/main/kotlin-js'
             kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-js'
         }
diff --git a/kotlin-native/tools/performance-server/build.gradle.kts b/kotlin-native/tools/performance-server/build.gradle.kts
index 08db0d2b094..c8bf4ab2869 100644
--- a/kotlin-native/tools/performance-server/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/build.gradle.kts
@@ -36,13 +36,12 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
             }
             kotlin.srcDir("../benchmarks/shared/src")
         }
         val jsMain by creating {
             dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
                 implementation(npm("body-parser", "~1.20.0"))
                 implementation(npm("debug", "~4.3.4"))
                 implementation(npm("ejs", "~3.1.7"))
diff --git a/kotlin-native/tools/performance-server/ui/build.gradle.kts b/kotlin-native/tools/performance-server/ui/build.gradle.kts
index 9fadbf70c9c..facd122cbb2 100644
--- a/kotlin-native/tools/performance-server/ui/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/ui/build.gradle.kts
@@ -44,14 +44,11 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
             }
             kotlin.srcDir("../../benchmarks/shared/src")
         }
         val jsMain by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
-            }
             kotlin.srcDir("src/main/kotlin")
             kotlin.srcDir("../shared/src/main/kotlin")
             kotlin.srcDir("../src/main/kotlin-js")
diff --git a/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts b/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts
index cf8d80850ec..590ee7bb399 100644
--- a/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts
+++ b/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts
@@ -12,19 +12,13 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(kotlin("stdlib-common"))
+                implementation(kotlinStdlib())
             }
         }
         val jvmMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib-jdk8"))
-            }
         }
 
         val jsMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
         }
     }
 }