From 21565c612821b55d4e94617960d560e2cf09f384 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 28 Jul 2023 16:11:21 +0200
Subject: [PATCH] [stdlib-mpp] Add dependency constraints to JVM variant,
 KT-55297

---
 gradle/verification-metadata.xml              | 12 ++++++++++++
 libraries/stdlib/build.gradle.kts             | 12 ++++++++++++
 .../kotlin/gradle/StdlibAlignmentIT.kt        |  2 ++
 .../kotlin/kotlin-stdlib/kotlin-stdlib.pom    | 19 +++++++++++++++++++
 4 files changed, 45 insertions(+)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e5768490a5d..f12745e7188 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -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"/>
diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index 04a486a444e..ae4222eca4b 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -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")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/StdlibAlignmentIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/StdlibAlignmentIT.kt
index 87a336c3c91..adbd56b505b 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/StdlibAlignmentIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/StdlibAlignmentIT.kt
@@ -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(
                 """
diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-stdlib/kotlin-stdlib.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-stdlib/kotlin-stdlib.pom
index 89900137d11..4bfb3cf1458 100644
--- a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-stdlib/kotlin-stdlib.pom
+++ b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-stdlib/kotlin-stdlib.pom
@@ -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>