From e724cfa60f16591f62210cb8a0a6f57c16b6ba79 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Fri, 22 Jun 2018 17:21:04 +0300
Subject: [PATCH] Revert "Build: Copy uast to idea plugin as separate
 artifacts"

This reverts commit e6f6451
---
 plugins/lint/build.gradle.kts             |  1 +
 plugins/lint/build.gradle.kts.173         | 34 -----------------------
 plugins/uast-kotlin-idea/build.gradle.kts |  5 ----
 plugins/uast-kotlin/build.gradle.kts      |  2 --
 plugins/uast-kotlin/build.gradle.kts.173  |  2 --
 prepare/android-lint/build.gradle.kts     | 29 +++++++++++++++++++
 settings.gradle                           |  2 ++
 7 files changed, 32 insertions(+), 43 deletions(-)
 delete mode 100644 plugins/lint/build.gradle.kts.173
 create mode 100644 prepare/android-lint/build.gradle.kts

diff --git a/plugins/lint/build.gradle.kts b/plugins/lint/build.gradle.kts
index bdeb8e37bef..111084beb92 100644
--- a/plugins/lint/build.gradle.kts
+++ b/plugins/lint/build.gradle.kts
@@ -26,3 +26,4 @@ sourceSets {
     }
     "test" {}
 }
+
diff --git a/plugins/lint/build.gradle.kts.173 b/plugins/lint/build.gradle.kts.173
deleted file mode 100644
index 4f33b500436..00000000000
--- a/plugins/lint/build.gradle.kts.173
+++ /dev/null
@@ -1,34 +0,0 @@
-
-plugins {
-    java
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    compile(project(":compiler:frontend"))
-    compile(project(":idea"))
-    compile(project(":idea:idea-jvm"))
-    compile(project(":idea:idea-core"))
-    compile(project(":idea:idea-android"))
-    compile(project(":plugins:uast-kotlin"))
-    compileOnly(project(":kotlin-android-extensions-runtime"))
-    compileOnly(intellijDep())
-    compileOnly(intellijPluginDep("android"))
-}
-
-sourceSets {
-    "main" {
-        java.srcDirs("android-annotations/src",
-                     "lint-api/src",
-                     "lint-checks/src",
-                     "lint-idea/src")
-    }
-    "test" {}
-}
-
-runtimeJar {
-    archiveName = "android-lint.jar"
-}
-
-ideaPlugin()
diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts
index 89363eff0f1..308a3a3e73a 100644
--- a/plugins/uast-kotlin-idea/build.gradle.kts
+++ b/plugins/uast-kotlin-idea/build.gradle.kts
@@ -19,8 +19,3 @@ sourceSets {
     "test" {}
 }
 
-runtimeJar {
-    archiveName = "uast-kotlin-ide.jar"
-}
-
-ideaPlugin()
\ No newline at end of file
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index 9cc54f0ef75..3c93d9440e0 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -48,5 +48,3 @@ testsJar {}
 projectTest {
     workingDir = rootDir
 }
-
-ideaPlugin()
\ No newline at end of file
diff --git a/plugins/uast-kotlin/build.gradle.kts.173 b/plugins/uast-kotlin/build.gradle.kts.173
index 7a66941d5be..854fb20e8b4 100644
--- a/plugins/uast-kotlin/build.gradle.kts.173
+++ b/plugins/uast-kotlin/build.gradle.kts.173
@@ -48,5 +48,3 @@ testsJar {}
 projectTest {
     workingDir = rootDir
 }
-
-ideaPlugin()
\ No newline at end of file
diff --git a/prepare/android-lint/build.gradle.kts b/prepare/android-lint/build.gradle.kts
new file mode 100644
index 00000000000..d0523c06501
--- /dev/null
+++ b/prepare/android-lint/build.gradle.kts
@@ -0,0 +1,29 @@
+
+description = "Kotlin Android Lint"
+
+plugins {
+    `java-base`
+    id("jps-compatible")
+}
+
+val projectsToShadow = listOf(
+        ":plugins:lint",
+        ":plugins:uast-kotlin",
+        ":plugins:uast-kotlin-idea")
+
+sourceSets {
+    "main" {}
+    "test" {}
+}
+
+dependencies {
+    projectsToShadow.forEach { p ->
+        embeddedComponents(project(p)) { isTransitive = false }
+    }
+}
+
+runtimeJar {
+    fromEmbeddedComponents()
+}
+
+ideaPlugin()
diff --git a/settings.gradle b/settings.gradle
index 13d2de8123c..4fdf9b269bd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -123,6 +123,7 @@ include ":kotlin-build-common",
         ":prepare:ide-lazy-resolver",
         ":prepare:idea-plugin",
         ":prepare:cidr-plugin",
+        ":android-lint",
         ":kotlin-compiler",
         ":kotlin-compiler-embeddable",
         ":kotlin-compiler-client-embeddable",
@@ -234,6 +235,7 @@ project(':kotlin-android-extensions').projectDir = "$rootDir/prepare/android-ext
 project(':kotlin-android-extensions-runtime').projectDir = "$rootDir/plugins/android-extensions/android-extensions-runtime" as File
 project(':plugins:android-extensions-ide').projectDir = "$rootDir/plugins/android-extensions/android-extensions-idea" as File
 project(':plugins:android-extensions-jps').projectDir = "$rootDir/plugins/android-extensions/android-extensions-jps" as File
+project(':android-lint').projectDir = "$rootDir/prepare/android-lint" as File
 project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen/allopen-cli" as File
 project(':allopen-ide-plugin').projectDir = "$rootDir/plugins/allopen/allopen-ide" as File
 project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg/noarg-cli" as File