From 06b4fe1613c27b2edc4b9137ecf0894956f3c173 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Fri, 11 Jun 2021 22:43:40 +0300
Subject: [PATCH] Build: Fix kotlin-stdlib-jvm-minimal-for-test usages

Name changed after publishing with main artifacts for external usage
---
 .../kotlin/codegen/forTestCompile/ForTestCompileRuntime.java    | 2 +-
 gradle/jps.gradle.kts                                           | 2 +-
 gradle/verification-metadata.xml                                | 2 +-
 libraries/stdlib/jps-build/build.gradle.kts                     | 2 +-
 libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt              | 2 +-
 libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt         | 2 +-
 libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
index a9771702cc2..cf6e5f4c656 100644
--- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
+++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -32,7 +32,7 @@ public class ForTestCompileRuntime {
 
     @NotNull
     public static File minimalRuntimeJarForTests() {
-        return assertExists(new File("dist/kotlin-stdlib-minimal-for-test.jar"));
+        return assertExists(new File("dist/kotlin-stdlib-jvm-minimal-for-test.jar"));
     }
 
     @NotNull
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index d08e3abf9c8..251b689dfdc 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -321,7 +321,7 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.dist() {
         file("$rootDir/build/build.txt")
 
         // Use output-file-name when fixed https://github.com/JetBrains/gradle-idea-ext-plugin/issues/63
-        archive("kotlin-stdlib-minimal-for-test.jar") {
+        archive("kotlin-stdlib-jvm-minimal-for-test.jar") {
             extractedDirectory(stdlibMinimal.singleFile)
         }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5c3915cbea1..c442ff636be 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -41,7 +41,7 @@
          <trust group="org.jetbrains.kotlin" name="builtins"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8"/>
-         <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-minimal-for-test"/>
+         <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jvm-minimal-for-test"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-project-model"/>
          <trust file="kotlin-native-prebuilt-.*" regex="true"/>
          <trust file=".*-javadoc[.]jar" regex="true"/>
diff --git a/libraries/stdlib/jps-build/build.gradle.kts b/libraries/stdlib/jps-build/build.gradle.kts
index 8c86d062d7d..bdf54bca786 100644
--- a/libraries/stdlib/jps-build/build.gradle.kts
+++ b/libraries/stdlib/jps-build/build.gradle.kts
@@ -11,7 +11,7 @@ val commonStdlibSources by configurations.creating
 val builtins by configurations.creating
 
 dependencies {
-    stdlibMinimal("org.jetbrains.kotlin:kotlin-stdlib-minimal-for-test:$bootstrapKotlinVersion")
+    stdlibMinimal("org.jetbrains.kotlin:kotlin-stdlib-jvm-minimal-for-test:$bootstrapKotlinVersion")
     stdlibJS("org.jetbrains.kotlin:kotlin-stdlib-js:$bootstrapKotlinVersion") { isTransitive = false }
     stdlibSources("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion:sources") { isTransitive = false }
 
diff --git a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt
index d6acee16222..ba5b810e8a7 100644
--- a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt
+++ b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
+@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-jvm-minimal-for-test
 
 package kotlin
 
diff --git a/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt b/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt
index 936564a352f..d71ea556b50 100644
--- a/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt
+++ b/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
+@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-jvm-minimal-for-test
 
 package kotlin.text
 
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt b/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt
index 7d33a28ce81..4a8bcb04204 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
+@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-jvm-minimal-for-test
 
 package kotlin.collections