From 86ad25ba55a4c685926ddf7bfd935f7c1d4e026a Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Thu, 18 Apr 2019 22:50:43 +0300
Subject: [PATCH] Build: Add jps artifact for kotlin-reflect

---
 .gitignore                             |  1 +
 .idea/artifacts/kotlin_reflect_jar.xml | 22 ----------------------
 gradle/jps.gradle.kts                  |  5 +++++
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 .idea/artifacts/kotlin_reflect_jar.xml

diff --git a/.gitignore b/.gitignore
index 2063f136b99..40e7d531025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ build/
 .idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
 .idea/artifacts/kotlin_main_kts_jar.xml
 .idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
+.idea/artifacts/kotlin_reflect_jar.xml
 kotlin-ultimate/
 node_modules/
 .rpt2_cache/
diff --git a/.idea/artifacts/kotlin_reflect_jar.xml b/.idea/artifacts/kotlin_reflect_jar.xml
deleted file mode 100644
index 3465b363076..00000000000
--- a/.idea/artifacts/kotlin_reflect_jar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="kotlin-reflect.jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/kotlin_reflect_jar</output-path>
-    <root id="archive" name="kotlin-reflect.jar">
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/libraries/reflect/build/tmp/result/MANIFEST.MF" />
-      </element>
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/protobuf-lite/2.6.1/9af39e6d6cbd4404d06ae2ae63505b6247e6760b/protobuf-lite-2.6.1.jar" path-in-jar="/" />
-      <element id="module-output" name="kotlin.core.descriptors.jvm.main" />
-      <element id="module-output" name="kotlin.core.descriptors.runtime.main" />
-      <element id="module-output" name="kotlin.core.descriptors.main" />
-      <element id="module-output" name="kotlin.core.deserialization.main" />
-      <element id="module-output" name="kotlin.kotlin-reflect-api.main" />
-      <element id="module-output" name="kotlin.kotlin-reflect.main" />
-      <element id="module-output" name="kotlin.core.metadata.jvm.main" />
-      <element id="module-output" name="kotlin.core.metadata.main" />
-      <element id="module-output" name="kotlin.core.util.runtime.main" />
-      <element id="module-output" name="kotlin.core.type-system.main" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index 2dc0574086c..f76a86fec4d 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -61,6 +61,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
 
                         kotlinPluginJar()
 
+                        kotlinReflectJar()
+
                         kotlinCompilerClientEmbeddableJar()
 
                         kotlinMainKtsJar()
@@ -183,6 +185,9 @@ val jarArtifactProjects = listOf(
     "kotlin-reflect"
 )
 
+fun NamedDomainObjectContainer<TopLevelArtifact>.kotlinReflectJar() =
+    jarFromProject(project(":kotlin-reflect"))
+
 fun NamedDomainObjectContainer<TopLevelArtifact>.kotlinCompilerClientEmbeddableJar() =
     jarFromProject(project(":kotlin-compiler-client-embeddable"))