Build: Embed projects not published to maven into kotlin-plugin.jar

2019-03-14 19:34:53 +03:00
parent 4ff1506161
commit d554b5aafa
24 changed files with 39 additions and 107 deletions
@@ -90,10 +90,6 @@ projectTest {
    useAndroidSdk()
 }

-testsJar {}
+testsJar()

-runtimeJar {
-    archiveName = "android-ide.jar"
-}
-
-ideaPlugin()
+runtimeJar()
@@ -23,8 +23,4 @@ sourceSets {
    "test" {}
 }

-runtimeJar {
-    archiveName = "android-output-parser-ide.jar"
-}
-
-ideaPlugin()
+runtimeJar()
@@ -14,5 +14,3 @@ sourceSets {
    "main" { projectDefault() }
    "test" {  }
 }
-
-ideaPlugin()
@@ -21,8 +21,4 @@ sourceSets {
    "test" {}
 }

-runtimeJar {
-    archiveName = "jps-common-ide.jar"
-}
-
-ideaPlugin()
+runtimeJar()
@@ -31,8 +31,4 @@ sourceSets {

 configureFormInstrumentation()

-runtimeJar {
-    archiveName = "jvm-ide.jar"
-}
-
-ideaPlugin()
+runtimeJar()
@@ -76,11 +76,6 @@ projectTest {
    workingDir = rootDir
 }

-
 if (Ide.IJ()) {
-    runtimeJar {
-        archiveName = "maven-ide.jar"
-    }
-
-    ideaPlugin()
+    runtimeJar()
 }
@@ -19,5 +19,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
@@ -19,5 +19,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
@@ -19,5 +19,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
@@ -101,4 +101,3 @@ fun configureFreeCompilerArg(isEnabled: Boolean, compilerArgument: String) {
        }
    }
 }
-ideaPlugin()
@@ -35,10 +35,6 @@ testsJar {}

 dist(targetName = the<BasePluginConvention>().archivesBaseName.removePrefix("kotlin-") + ".jar")

-ideaPlugin {
-    from(jar)
-}
-
 projectTest {
    workingDir = rootDir
 }
@@ -26,6 +26,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
-
@@ -48,8 +48,6 @@ runtimeJar {

 dist()

-ideaPlugin()
-
 testsJar {}

 evaluationDependsOn(":kotlin-android-extensions-runtime")
@@ -82,5 +82,3 @@ projectTest {
 }

 runtimeJar()
-
-ideaPlugin()
@@ -21,8 +21,4 @@ sourceSets {
    "test" {}
 }

-val jar = runtimeJar()
-
-ideaPlugin {
-    from(jar)
-}
+runtimeJar()
@@ -23,10 +23,6 @@ sourceSets {
    "test" {}
 }

-val jar = runtimeJar {}
+runtimeJar()

 dist(targetName = the<BasePluginConvention>().archivesBaseName + ".jar")
-
-ideaPlugin {
-    from(jar)
-}
@@ -23,6 +23,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
-
@@ -30,16 +30,12 @@ sourceSets {
    "test" { projectDefault() }
 }

-val jar = runtimeJar {}
+runtimeJar()

-testsJar {}
+testsJar()

 dist(targetName = the<BasePluginConvention>().archivesBaseName.removePrefix("kotlin-") + ".jar")

-ideaPlugin {
-    from(jar)
-}
-
 projectTest {
    workingDir = rootDir
 }
@@ -27,5 +27,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
@@ -33,6 +33,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
-
@@ -20,6 +20,3 @@ sourceSets {
 }

 runtimeJar()
-
-ideaPlugin()
-
@@ -1,29 +0,0 @@
-
-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()
@@ -51,7 +51,6 @@ val projectsToShadow by extra(listOf(
        ":idea:idea-core",
        ":idea:idea-gradle",
        ":idea:idea-gradle-native",
-        //":idea-ultimate",
        ":compiler:ir.psi2ir",
        ":compiler:ir.tree",
        ":js:js.ast",
@@ -67,7 +66,34 @@ val projectsToShadow by extra(listOf(
        ":compiler:resolution",
        ":compiler:serialization",
        ":compiler:util",
-        ":core:util.runtime"))
+        ":core:util.runtime",
+        ":allopen-ide-plugin",
+        ":plugins:lint",
+        ":plugins:uast-kotlin",
+        ":plugins:uast-kotlin-idea",
+        ":j2k",
+        ":kotlin-allopen-compiler-plugin",
+        ":kotlin-noarg-compiler-plugin",
+        ":kotlin-sam-with-receiver-compiler-plugin",
+        ":kotlin-scripting-idea",
+        ":kotlinx-serialization-compiler-plugin",
+        ":kotlinx-serialization-ide-plugin",
+        ":noarg-ide-plugin",
+        ":sam-with-receiver-ide-plugin",
+        ":idea:idea-android",
+        ":idea:idea-android-output-parser",
+        ":idea:idea-jvm",
+        ":idea:idea-git",
+        ":idea:idea-jps-common",
+        ":idea:kotlin-gradle-tooling",
+        ":plugins:android-extensions-compiler",
+        ":plugins:android-extensions-ide",
+        ":plugins:kapt3-idea",
+        *if (Ide.IJ())
+            arrayOf(":idea:idea-maven")
+        else
+            emptyArray<String>()
+))

 // Do not rename, used in pill importer
 val packedJars by configurations.creating
@@ -94,6 +120,7 @@ dependencies {
 }

 val jar = runtimeJar {
+    dependsOn(packedJars)
    from("$rootDir/resources/kotlinManifest.properties")
    from {
        packedJars.files.map(::zipTree)
@@ -134,7 +134,6 @@ include ":kotlin-build-common",
        ":prepare:formatter",
        ":prepare:ide-lazy-resolver",
        ":prepare:idea-plugin",
-        ":android-lint",
        ":kotlin-compiler",
        ":kotlin-compiler-embeddable",
        ":kotlin-compiler-client-embeddable",
@@ -302,7 +301,6 @@ project(':plugins:android-extensions-compiler').projectDir = "$rootDir/plugins/a
 project(':kotlin-android-extensions').projectDir = "$rootDir/prepare/android-extensions-compiler-gradle" as File
 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(':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