From 008c27d5476d169f7cf96180fd5557698a9ded02 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 14 Jul 2017 22:43:31 +0300
Subject: [PATCH] Compiler build depends on kotlinx-coroutines-core

---
 build.xml                                          | 2 ++
 libraries/tools/kotlin-compiler-embeddable/pom.xml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/build.xml b/build.xml
index ed1d3d9ef2e..5353bbe257d 100644
--- a/build.xml
+++ b/build.xml
@@ -65,6 +65,7 @@
         <fileset dir="${dependencies}" includes="jline.jar"/>
         <fileset dir="${dependencies}" includes="javaslang-2.0.6.jar"/>
         <fileset dir="${dependencies}" includes="json-org.jar"/>
+        <fileset dir="${dependencies}" includes="kotlinx-coroutines-core.jar"/>
         <fileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/>
     </path>
 
@@ -403,6 +404,7 @@
                 <zipfileset src="${dependencies}/javaslang-2.0.6.jar"/>
                 <zipfileset src="${dependencies}/json-org.jar"/>
                 <zipfileset src="${protobuf.jar}"/>
+                <zipfileset src="${dependencies}/kotlinx-coroutines-core.jar"/>
 
                 <manifest>
                     <attribute name="Built-By" value="${manifest.impl.vendor}"/>
diff --git a/libraries/tools/kotlin-compiler-embeddable/pom.xml b/libraries/tools/kotlin-compiler-embeddable/pom.xml
index d67e8ef5e9c..8424dfe87fa 100644
--- a/libraries/tools/kotlin-compiler-embeddable/pom.xml
+++ b/libraries/tools/kotlin-compiler-embeddable/pom.xml
@@ -124,6 +124,10 @@
                                     <pattern>javax.inject</pattern>
                                     <shadedPattern>${kotlin.relocated.package}.javax.inject</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>kotlinx.coroutines</pattern>
+                                    <shadedPattern>${kotlin.relocated.package}.kotlinx.coroutines</shadedPattern>
+                                </relocation>
                             </relocations>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>