[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
This commit is contained in:
Ilya Gorbunov
2023-08-16 03:34:12 +02:00
committed by Space Team
parent 16e61f978c
commit 35bca103eb
4 changed files with 5 additions and 29 deletions
@@ -50,7 +50,7 @@ kotlin {
sourceSets { sourceSets {
commonMain { commonMain {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
} }
kotlin.srcDir '../benchmarks/shared/src' kotlin.srcDir '../benchmarks/shared/src'
kotlin.srcDir 'src/main/kotlin' kotlin.srcDir 'src/main/kotlin'
@@ -58,21 +58,13 @@ kotlin {
} }
commonTest { commonTest {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinVersion"
} }
kotlin.srcDir 'src/tests' kotlin.srcDir 'src/tests'
} }
jvmTest { jvmTest {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
}
} }
jsTest { jsTest {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion"
}
} }
nativeMain { nativeMain {
dependsOn commonMain dependsOn commonMain
@@ -80,16 +72,10 @@ kotlin {
kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-native' kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-native'
} }
jvmMain { jvmMain {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
}
kotlin.srcDir 'src/main/kotlin-jvm' kotlin.srcDir 'src/main/kotlin-jvm'
kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-jvm' kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-jvm'
} }
jsMain { jsMain {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion"
}
kotlin.srcDir 'src/main/kotlin-js' kotlin.srcDir 'src/main/kotlin-js'
kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-js' kotlin.srcDir '../../endorsedLibraries/kotlinx.cli/src/main/kotlin-js'
} }
@@ -36,13 +36,12 @@ kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
} }
kotlin.srcDir("../benchmarks/shared/src") kotlin.srcDir("../benchmarks/shared/src")
} }
val jsMain by creating { val jsMain by creating {
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
implementation(npm("body-parser", "~1.20.0")) implementation(npm("body-parser", "~1.20.0"))
implementation(npm("debug", "~4.3.4")) implementation(npm("debug", "~4.3.4"))
implementation(npm("ejs", "~3.1.7")) implementation(npm("ejs", "~3.1.7"))
@@ -44,14 +44,11 @@ kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
} }
kotlin.srcDir("../../benchmarks/shared/src") kotlin.srcDir("../../benchmarks/shared/src")
} }
val jsMain by getting { val jsMain by getting {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
}
kotlin.srcDir("src/main/kotlin") kotlin.srcDir("src/main/kotlin")
kotlin.srcDir("../shared/src/main/kotlin") kotlin.srcDir("../shared/src/main/kotlin")
kotlin.srcDir("../src/main/kotlin-js") kotlin.srcDir("../src/main/kotlin-js")
@@ -12,19 +12,13 @@ kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
implementation(kotlin("stdlib-common")) implementation(kotlinStdlib())
} }
} }
val jvmMain by getting { val jvmMain by getting {
dependencies {
implementation(kotlin("stdlib-jdk8"))
}
} }
val jsMain by getting { val jsMain by getting {
dependencies {
implementation(kotlin("stdlib-js"))
}
} }
} }
} }