Make source set empty for Android modules of deleting the resulting JAR files in 'ideaPlugin' task

build.gradle.kts.as33

@@ -375,12 +375,6 @@ val ideaPlugin by task<Task> {
     dependsOn(copyCompilerToIdeaPlugin)
     val childIdeaPluginTasks = getTasksByName("ideaPlugin", true) - this@task
     dependsOn(childIdeaPluginTasks)
-
-    doLast {
-        delete("$ideaPluginDir/lib/android-ide.jar")
-        delete("$ideaPluginDir/lib/android-output-parser-ide.jar")
-        delete("$ideaPluginDir/lib/android-extensions-ide.jar")
-    }
 }
 
 tasks {

idea/idea-android/build.gradle.kts.as33

@@ -0,0 +1,80 @@
+
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    testRuntime(intellijDep())
+
+    compileOnly(project(":kotlin-reflect-api"))
+    compile(project(":compiler:util"))
+    compile(project(":compiler:light-classes"))
+    compile(project(":compiler:frontend"))
+    compile(project(":compiler:frontend.java"))
+    compile(project(":idea"))
+    compile(project(":idea:idea-jvm"))
+    compile(project(":idea:idea-core"))
+    compile(project(":idea:ide-common"))
+    compile(project(":idea:idea-gradle"))
+
+    compile(androidDxJar())
+
+    compileOnly(project(":kotlin-android-extensions-runtime"))
+    compileOnly(intellijDep())
+    compileOnly(intellijPluginDep("android"))
+
+    testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(project(":plugins:lint")) { isTransitive = false }
+    testCompile(project(":idea:idea-jvm"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(projectTests(":idea"))
+    testCompile(projectTests(":idea:idea-gradle"))
+    testCompile(commonDep("junit:junit"))
+
+    testCompile(intellijDep())
+    testCompile(intellijPluginDep("properties"))
+    testCompileOnly(intellijPluginDep("android"))
+
+    testRuntime(projectDist(":kotlin-reflect"))
+    testRuntime(project(":plugins:android-extensions-ide"))
+    testRuntime(project(":plugins:kapt3-idea"))
+    testRuntime(project(":sam-with-receiver-ide-plugin"))
+    testRuntime(project(":noarg-ide-plugin"))
+    testRuntime(project(":allopen-ide-plugin"))
+    testRuntime(project(":kotlin-scripting-idea"))
+
+    testRuntime(intellijPluginDep("android"))
+    testRuntime(intellijPluginDep("smali"))
+    testRuntime(intellijPluginDep("copyright"))
+    testRuntime(intellijPluginDep("coverage"))
+    testRuntime(intellijPluginDep("gradle"))
+    testRuntime(intellijPluginDep("Groovy"))
+    testRuntime(intellijPluginDep("IntelliLang"))
+    testRuntime(intellijPluginDep("java-decompiler"))
+    testRuntime(intellijPluginDep("java-i18n"))
+    testRuntime(intellijPluginDep("junit"))
+    //testRuntime(intellijPluginDep("maven"))
+    testRuntime(intellijPluginDep("testng"))
+}
+
+sourceSets {
+    "main" {}
+    "test" {}
+}
+
+projectTest {
+    workingDir = rootDir
+    useAndroidSdk()
+}
+
+testsJar {}
+
+runtimeJar {
+    archiveName = "android-ide.jar"
+}
+
+ideaPlugin()

idea/idea-android/idea-android-output-parser/build.gradle.kts.as33

@@ -0,0 +1,25 @@
+
+plugins {
+    kotlin("jvm")
+}
+
+apply { plugin("jps-compatible") }
+
+dependencies {
+    compile(project(":compiler:util"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep())
+    compileOnly(intellijPluginDep("gradle"))
+    compileOnly(intellijPluginDep("android"))
+}
+
+sourceSets {
+    "main" {}
+    "test" {}
+}
+
+runtimeJar {
+    archiveName = "android-output-parser-ide.jar"
+}
+
+ideaPlugin()

plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33

@@ -0,0 +1,76 @@
+
+description = "Kotlin Android Extensions IDEA"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+jvmTarget = "1.6"
+
+dependencies {
+    testRuntime(intellijDep())
+
+    compile(project(":compiler:util"))
+    compile(project(":compiler:light-classes"))
+    compile(project(":idea:idea-core"))
+    compile(project(":idea"))
+    compile(project(":idea:idea-jvm"))
+    compile(project(":idea:idea-gradle"))
+    compile(project(":plugins:android-extensions-compiler"))
+    compileOnly(project(":kotlin-android-extensions-runtime"))
+    compileOnly(intellijPluginDep("android"))
+    compileOnly(intellijPluginDep("Groovy"))
+    compileOnly(intellijDep())
+
+    testCompile(project(":compiler:tests-common"))
+    testCompile(project(":compiler:cli"))
+    testCompile(project(":compiler:frontend.java"))
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(project(":plugins:kapt3-idea"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(projectTests(":idea"))
+    testCompile(projectTests(":idea:idea-android"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
+    testCompile(commonDep("junit:junit"))
+    testRuntime(projectDist(":kotlin-reflect"))
+    testCompile(intellijPluginDep("android"))
+    testCompile(intellijPluginDep("Groovy"))
+    testCompile(intellijDep())
+
+    testRuntime(project(":idea:idea-jvm"))
+    testRuntime(project(":plugins:android-extensions-jps"))
+    testRuntime(project(":sam-with-receiver-ide-plugin"))
+    testRuntime(project(":noarg-ide-plugin"))
+    testRuntime(project(":allopen-ide-plugin"))
+    testRuntime(project(":kotlin-scripting-idea"))
+    testRuntime(project(":plugins:lint"))
+    testRuntime(intellijPluginDep("junit"))
+    testRuntime(intellijPluginDep("IntelliLang"))
+    testRuntime(intellijPluginDep("properties"))
+    testRuntime(intellijPluginDep("java-i18n"))
+    testRuntime(intellijPluginDep("gradle"))
+    testRuntime(intellijPluginDep("Groovy"))
+    testRuntime(intellijPluginDep("java-decompiler"))
+    //testRuntime(intellijPluginDep("maven"))
+    testRuntime(intellijPluginDep("android"))
+    testRuntime(intellijPluginDep("smali"))
+}
+
+sourceSets {
+    "main" {}
+    "test" {}
+}
+
+testsJar {}
+
+projectTest {
+    dependsOn(":kotlin-android-extensions-runtime:dist")
+    workingDir = rootDir
+    useAndroidSdk()
+    useAndroidJar()
+}
+
+runtimeJar()
+
+ideaPlugin()

plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33

@@ -0,0 +1,42 @@
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    testRuntime(intellijDep())
+
+    compile(project(":compiler:util"))
+    compile(project(":jps-plugin"))
+    compile(project(":plugins:android-extensions-compiler"))
+    compileOnly(intellijDep()) { includeJars("openapi", "jps-builders", "jps-model", "jdom") }
+    compileOnly(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
+    compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
+
+    testCompile(projectTests(":jps-plugin"))
+    testCompile(project(":compiler:tests-common"))
+    testCompile(commonDep("junit:junit"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
+    testCompile(projectTests(":kotlin-build-common"))
+    testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") }
+    testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") }
+    testCompileOnly(intellijDep()) { includeJars("jps-model") }
+
+    testRuntime(intellijPluginDep("android"))
+    testRuntime(intellijPluginDep("smali"))
+    testRuntime(intellijDep("jps-build-test"))
+    testRuntime(intellijDep("jps-standalone"))
+}
+
+sourceSets {
+    "main" {}
+    "test" {}
+}
+
+projectTest {
+    workingDir = rootDir
+    useAndroidSdk()
+}
+
+testsJar {}