From 0c2591e93820239e6b569ba54e1844680b7bb0df Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 31 May 2021 11:52:38 +0200
Subject: [PATCH] Bump coroutines version used in scripting to 1.5.0

#KT-43917 fixed
---
 build.gradle.kts                              |  4 +--
 .../org/jetbrains/kotlin/utils/PathUtil.kt    |  2 +-
 gradle/verification-metadata.xml              | 30 +++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a97df692a6f..7584fcacc0e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -128,8 +128,8 @@ extra["versions.junit"] = "4.12"
 extra["versions.javaslang"] = "2.0.6"
 extra["versions.ant"] = "1.10.7"
 extra["versions.android"] = "2.3.1"
-extra["versions.kotlinx-coroutines-core"] = "1.3.8"
-extra["versions.kotlinx-coroutines-jdk8"] = "1.3.8"
+extra["versions.kotlinx-coroutines-core"] = "1.5.0"
+extra["versions.kotlinx-coroutines-jdk8"] = "1.5.0"
 extra["versions.json"] = "20160807"
 extra["versions.native-platform"] = "0.14"
 extra["versions.robolectric"] = "4.0"
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
index ffc48d6c480..4672c68a10a 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
@@ -77,7 +77,7 @@ object PathUtil {
     const val KOTLIN_DAEMON_JAR = "$KOTLIN_SCRIPTING_JVM_NAME.jar"
     const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler"
     const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar"
-    const val KOTLINX_COROUTINES_CORE_NAME = "kotlinx-coroutines-core"
+    const val KOTLINX_COROUTINES_CORE_NAME = "kotlinx-coroutines-core-jvm"
     const val KOTLINX_COROUTINES_CORE_JAR = "$KOTLINX_COROUTINES_CORE_NAME.jar"
     const val KOTLIN_SCRIPTING_COMPILER_IMPL_NAME = "kotlin-scripting-compiler-impl"
     const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "$KOTLIN_SCRIPTING_COMPILER_IMPL_NAME.jar"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index b95dd3d77a7..ede0c161c55 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -8666,6 +8666,12 @@
             <sha256 value="421a102db816f9e65892c7b62a180605173ade7f67ce9a9adaae1bf5997b99b5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.5.0">
+         <artifact name="kotlinx-coroutines-core-1.5.0.jar">
+            <md5 value="33a98ceff78b73b413e2474e738b21ea" origin="Generated by Gradle"/>
+            <sha256 value="6f738012913d3d4bc18408a5011108d4744a72b6233662ee4d4dd50da9550b8d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-common" version="1.2.1">
          <artifact name="kotlinx-coroutines-core-common-1.2.1.jar">
             <md5 value="407df45d0bf75f5f313419ec4ccde0f1" origin="Generated by Gradle"/>
@@ -8696,6 +8702,18 @@
             <sha256 value="8203cdee7508793a7989e0abffb28364a0cd1ed8801c3a6b3a70d430033d1de5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.0">
+         <artifact name="kotlinx-coroutines-core-jvm-1.5.0.jar">
+            <md5 value="0a0d2e63b7d71b97778cbd41bb3dfce0" origin="Generated by Gradle"/>
+            <sha256 value="78d6cc7135f84d692ff3752fcfd1fa1bbe0940d7df70652e4f1eaeec0c78afbb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-metadata" version="1.4.2">
+         <artifact name="kotlinx-coroutines-core-metadata-1.4.2.jar">
+            <md5 value="8a47d1f6b24426367622f9d96b481452" origin="Generated by Gradle"/>
+            <sha256 value="9c615416dadd93f0e14895165af8eeee01a1aaaafe02c3eb1f2d2a770b595069" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-io" version="0.1.1">
          <artifact name="kotlinx-coroutines-io-0.1.1.jar">
             <md5 value="9bbd267f89d7f6187da5a58d685e90aa" origin="Generated by Gradle"/>
@@ -8756,6 +8774,18 @@
             <sha256 value="cc83d2ba2b0d381872b2f89d2192972fe6dd007dde0271b58a63ac6a686fa6eb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-jdk8" version="1.4.2">
+         <artifact name="kotlinx-coroutines-jdk8-1.4.2.jar">
+            <md5 value="50ee00d9a680b394afc16d25f58100eb" origin="Generated by Gradle"/>
+            <sha256 value="4048b6360c4de6dfba2ce9692eb92b13407e6e50fd72b0740dd95fcd01263ba4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-jdk8" version="1.5.0">
+         <artifact name="kotlinx-coroutines-jdk8-1.5.0.jar">
+            <md5 value="658ba740920aeb6862a8e9e4a024fb60" origin="Generated by Gradle"/>
+            <sha256 value="c9fd4bc3021b26753d59921fa65598455743aeccc380c02f8af5c5f4b64dfda3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-html" version="0.6.12">
          <artifact name="kotlinx-html-0.6.12.pom">
             <md5 value="5d943c8aad48535016f8904b5a9f9c2e" origin="Generated by Gradle"/>