From 838f1f91fc88102a4c1b9ad06a2baa3d3bcb3426 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Mon, 7 May 2018 21:16:35 +0300
Subject: [PATCH] Build: Extract android ide modules from kotlin-plugin.jar to
 standalone jars

So we could exclude them in IDEs which don't have android plugin (AppCode, CLion)
---
 build.gradle.kts                                             | 2 ++
 build.gradle.kts.182                                         | 2 ++
 idea/idea-android/build.gradle.kts                           | 5 +++++
 idea/idea-android/build.gradle.kts.173                       | 5 +++++
 idea/idea-android/build.gradle.kts.as31                      | 5 +++++
 idea/idea-android/build.gradle.kts.as32                      | 5 +++++
 .../idea-android/idea-android-output-parser/build.gradle.kts | 5 +++++
 prepare/idea-plugin/build.gradle.kts                         | 2 --
 8 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f2afa9ebc0f..0a4e76f20a0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -573,6 +573,8 @@ val cidrPlugin by task<Copy> {
 
         exclude("lib/android-ide.jar")
         exclude("lib/android-output-parser-ide.jar")
+        exclude("lib/android-extensions-ide.jar")
+        exclude("lib/android-extensions-compiler.jar")
     }
     from(cidrKotlinPlugin) { into("lib") }
 }
diff --git a/build.gradle.kts.182 b/build.gradle.kts.182
index 5fda7edde23..39afc6a138a 100644
--- a/build.gradle.kts.182
+++ b/build.gradle.kts.182
@@ -572,6 +572,8 @@ val cidrPlugin by task<Copy> {
 
         exclude("lib/android-ide.jar")
         exclude("lib/android-output-parser-ide.jar")
+        exclude("lib/android-extensions-ide.jar")
+        exclude("lib/android-extensions-compiler.jar")
     }
     from(cidrKotlinPlugin) { into("lib") }
 }
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index 4aa9da67a8f..e6687e91a05 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -72,3 +72,8 @@ projectTest {
 
 testsJar {}
 
+runtimeJar {
+    archiveName = "android-ide.jar"
+}
+
+ideaPlugin()
diff --git a/idea/idea-android/build.gradle.kts.173 b/idea/idea-android/build.gradle.kts.173
index 752305196b2..c38cd036b85 100644
--- a/idea/idea-android/build.gradle.kts.173
+++ b/idea/idea-android/build.gradle.kts.173
@@ -71,3 +71,8 @@ projectTest {
 
 testsJar {}
 
+runtimeJar {
+    archiveName = "android-ide.jar"
+}
+
+ideaPlugin()
diff --git a/idea/idea-android/build.gradle.kts.as31 b/idea/idea-android/build.gradle.kts.as31
index fc654ca0a23..45a71962fdd 100644
--- a/idea/idea-android/build.gradle.kts.as31
+++ b/idea/idea-android/build.gradle.kts.as31
@@ -72,3 +72,8 @@ projectTest {
 
 testsJar {}
 
+runtimeJar {
+    archiveName = "android-ide.jar"
+}
+
+ideaPlugin()
diff --git a/idea/idea-android/build.gradle.kts.as32 b/idea/idea-android/build.gradle.kts.as32
index fc654ca0a23..45a71962fdd 100644
--- a/idea/idea-android/build.gradle.kts.as32
+++ b/idea/idea-android/build.gradle.kts.as32
@@ -72,3 +72,8 @@ projectTest {
 
 testsJar {}
 
+runtimeJar {
+    archiveName = "android-ide.jar"
+}
+
+ideaPlugin()
diff --git a/idea/idea-android/idea-android-output-parser/build.gradle.kts b/idea/idea-android/idea-android-output-parser/build.gradle.kts
index 10af855fed9..c24a5fa9d42 100644
--- a/idea/idea-android/idea-android-output-parser/build.gradle.kts
+++ b/idea/idea-android/idea-android-output-parser/build.gradle.kts
@@ -18,3 +18,8 @@ sourceSets {
     "test" {}
 }
 
+runtimeJar {
+    archiveName = "android-output-parser-ide.jar"
+}
+
+ideaPlugin()
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 190338f591f..cedc395e385 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -29,8 +29,6 @@ val projectsToShadow by extra(listOf(
         ":compiler:frontend.script",
         ":idea:ide-common",
         ":idea",
-        ":idea:idea-android",
-        ":idea:idea-android-output-parser",
         ":idea:idea-core",
         ":idea:idea-jvm",
         ":idea:idea-jps-common",