[stdlib-mpp] Add dependency constraints to JVM variant, KT-55297
This commit is contained in:
committed by
Space Team
parent
b0106de209
commit
21565c6128
@@ -4197,6 +4197,12 @@
|
||||
<sha256 value="54f61351b1936ad88f4e53059fe781e723eae51d78ed9e7422d8b403574ec682" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.0">
|
||||
<artifact name="kotlin-stdlib-jdk7-1.8.0.jar">
|
||||
<md5 value="e881855ce1f9d9790c8fae52accc231d" origin="Generated by Gradle"/>
|
||||
<sha256 value="4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.10">
|
||||
<artifact name="kotlin-stdlib-jdk7-1.8.10.jar">
|
||||
<md5 value="d5c4884672ff26a0476a1a6807fe6137" origin="Generated by Gradle"/>
|
||||
@@ -4233,6 +4239,12 @@
|
||||
<sha256 value="8aafdd60c94f454c92e5066d266a5ed53ecc63c78f623b3fd9db56fea4032873" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.0">
|
||||
<artifact name="kotlin-stdlib-jdk8-1.8.0.jar">
|
||||
<md5 value="34246294df796300616b9b6352ffcece" origin="Generated by Gradle"/>
|
||||
<sha256 value="05b62804441b0c9a1920b6b7d5cf7329a4e24b6258478e32b1f046ca01900946" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.10">
|
||||
<artifact name="kotlin-stdlib-jdk8-1.8.10.jar">
|
||||
<md5 value="1cbbdbbfa072d00dc042d6ae62d3154f" origin="Generated by Gradle"/>
|
||||
|
||||
@@ -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")
|
||||
|
||||
+2
@@ -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(
|
||||
"""
|
||||
|
||||
+19
@@ -31,6 +31,25 @@
|
||||
<developerConnection>scm:git:https://github.com/JetBrains/kotlin.git</developerConnection>
|
||||
<url>https://github.com/JetBrains/kotlin</url>
|
||||
</scm>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib-common</artifactId>
|
||||
<version>ArtifactsTest.version</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib-jdk7</artifactId>
|
||||
<version>1.8.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
||||
<version>1.8.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains</groupId>
|
||||
|
||||
Reference in New Issue
Block a user