Revert "Build: Copy uast to idea plugin as separate artifacts"

This reverts commit e6f6451
2018-06-22 17:21:04 +03:00
parent bef97d85af
commit e724cfa60f
7 changed files with 32 additions and 43 deletions
@@ -26,3 +26,4 @@ sourceSets {
    }
    "test" {}
 }
+
@@ -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()
@@ -19,8 +19,3 @@ sourceSets {
    "test" {}
 }

-runtimeJar {
-    archiveName = "uast-kotlin-ide.jar"
-}
-
-ideaPlugin()
@@ -48,5 +48,3 @@ testsJar {}
 projectTest {
    workingDir = rootDir
 }
-
-ideaPlugin()
@@ -48,5 +48,3 @@ testsJar {}
 projectTest {
    workingDir = rootDir
 }
-
-ideaPlugin()
@@ -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()
@@ -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