[stdlib-mpp] Add dependency constraints to JVM variant, KT-55297

This commit is contained in:
Ilya Gorbunov
2023-07-28 16:11:21 +02:00
committed by Space Team
parent b0106de209
commit 21565c6128
4 changed files with 45 additions and 0 deletions
+12
View File
@@ -445,6 +445,18 @@ kotlin {
}
}
dependencies {
val jvmMainImplementation by configurations.getting
constraints {
// there is no dependency anymore from kotlin-stdlib to kotlin-stdlib-common,
// but use this constraint to align it if another library brings it transitively
jvmMainImplementation(project(":kotlin-stdlib-common"))
// to avoid split package and duplicate classes on classpath after moving them from these artifacts in 1.8.0
jvmMainImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0")
jvmMainImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0")
}
}
tasks {
val metadataJar by existing(Jar::class) {
archiveAppendix.set("metadata")
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle
import org.gradle.api.JavaVersion
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.testbase.*
import org.jetbrains.kotlin.gradle.util.replaceText
import org.junit.jupiter.api.DisplayName
import kotlin.io.path.appendText
@@ -71,6 +72,7 @@ class StdlibAlignmentIT : KGPBaseTest() {
|}
""".trimMargin()
)
buildGradle.replaceText("kotlin-stdlib:\$kotlin_version", "kotlin-stdlib:1.9.0")
gradleProperties.appendText(
"""