From d554b5aafac97e42665bbe4ae296c5ee63f9e053 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 14 Mar 2019 19:34:53 +0300 Subject: [PATCH] Build: Embed projects not published to maven into kotlin-plugin.jar --- idea/idea-android/build.gradle.kts | 8 ++--- .../build.gradle.kts | 6 +--- idea/idea-git/build.gradle.kts | 2 -- idea/idea-jps-common/build.gradle.kts | 6 +--- idea/idea-jvm/build.gradle.kts | 6 +--- idea/idea-maven/build.gradle.kts | 7 +---- idea/kotlin-gradle-tooling/build.gradle.kts | 2 -- .../build.gradle.kts.181 | 2 -- .../build.gradle.kts.as32 | 2 -- j2k/build.gradle.kts | 1 - plugins/allopen/allopen-cli/build.gradle.kts | 4 --- plugins/allopen/allopen-ide/build.gradle.kts | 3 -- .../build.gradle.kts | 2 -- .../android-extensions-idea/build.gradle.kts | 2 -- plugins/kapt3/kapt3-idea/build.gradle.kts | 6 +--- .../build.gradle.kts | 6 +--- .../kotlin-serialization-ide/build.gradle.kts | 3 -- plugins/noarg/noarg-cli/build.gradle.kts | 8 ++--- plugins/noarg/noarg-ide/build.gradle.kts | 2 -- .../sam-with-receiver-ide/build.gradle.kts | 3 -- .../scripting/scripting-idea/build.gradle.kts | 3 -- prepare/android-lint/build.gradle.kts | 29 ----------------- prepare/idea-plugin/build.gradle.kts | 31 +++++++++++++++++-- settings.gradle | 2 -- 24 files changed, 39 insertions(+), 107 deletions(-) delete mode 100644 prepare/android-lint/build.gradle.kts diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 6d52c792155..a774c62b213 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -90,10 +90,6 @@ projectTest { useAndroidSdk() } -testsJar {} +testsJar() -runtimeJar { - archiveName = "android-ide.jar" -} - -ideaPlugin() +runtimeJar() 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 25c66512d5b..ad91162c588 100644 --- a/idea/idea-android/idea-android-output-parser/build.gradle.kts +++ b/idea/idea-android/idea-android-output-parser/build.gradle.kts @@ -23,8 +23,4 @@ sourceSets { "test" {} } -runtimeJar { - archiveName = "android-output-parser-ide.jar" -} - -ideaPlugin() +runtimeJar() diff --git a/idea/idea-git/build.gradle.kts b/idea/idea-git/build.gradle.kts index e32ca90f703..0a809544070 100644 --- a/idea/idea-git/build.gradle.kts +++ b/idea/idea-git/build.gradle.kts @@ -14,5 +14,3 @@ sourceSets { "main" { projectDefault() } "test" { } } - -ideaPlugin() diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts index 8bdbe44ec2c..05634b0156b 100644 --- a/idea/idea-jps-common/build.gradle.kts +++ b/idea/idea-jps-common/build.gradle.kts @@ -21,8 +21,4 @@ sourceSets { "test" {} } -runtimeJar { - archiveName = "jps-common-ide.jar" -} - -ideaPlugin() \ No newline at end of file +runtimeJar() diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts index f629a9e4d62..7d5baf10baa 100644 --- a/idea/idea-jvm/build.gradle.kts +++ b/idea/idea-jvm/build.gradle.kts @@ -31,8 +31,4 @@ sourceSets { configureFormInstrumentation() -runtimeJar { - archiveName = "jvm-ide.jar" -} - -ideaPlugin() +runtimeJar() diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index eb7536a674a..824ba241549 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -76,11 +76,6 @@ projectTest { workingDir = rootDir } - if (Ide.IJ()) { - runtimeJar { - archiveName = "maven-ide.jar" - } - - ideaPlugin() + runtimeJar() } diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts index 30cab133f3d..e0631dc48ce 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts +++ b/idea/kotlin-gradle-tooling/build.gradle.kts @@ -19,5 +19,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts.181 b/idea/kotlin-gradle-tooling/build.gradle.kts.181 index f50c4f8b2b2..4cf63a4542f 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts.181 +++ b/idea/kotlin-gradle-tooling/build.gradle.kts.181 @@ -19,5 +19,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts.as32 b/idea/kotlin-gradle-tooling/build.gradle.kts.as32 index f50c4f8b2b2..4cf63a4542f 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts.as32 +++ b/idea/kotlin-gradle-tooling/build.gradle.kts.as32 @@ -19,5 +19,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index c51bc15c674..1015632ff30 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -101,4 +101,3 @@ fun configureFreeCompilerArg(isEnabled: Boolean, compilerArgument: String) { } } } -ideaPlugin() diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts index 2ef9e5dc63c..14181b145f0 100644 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ b/plugins/allopen/allopen-cli/build.gradle.kts @@ -35,10 +35,6 @@ testsJar {} dist(targetName = the().archivesBaseName.removePrefix("kotlin-") + ".jar") -ideaPlugin { - from(jar) -} - projectTest { workingDir = rootDir } diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts index e404993e8e6..814f6f2e4bb 100644 --- a/plugins/allopen/allopen-ide/build.gradle.kts +++ b/plugins/allopen/allopen-ide/build.gradle.kts @@ -26,6 +26,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() - diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index 298f7f7a239..ebf8dc7dde4 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -48,8 +48,6 @@ runtimeJar { dist() -ideaPlugin() - testsJar {} evaluationDependsOn(":kotlin-android-extensions-runtime") diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 392d8faa353..7a6eab09cbb 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -82,5 +82,3 @@ projectTest { } runtimeJar() - -ideaPlugin() diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 242bde1fe72..c17fbc62692 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -21,8 +21,4 @@ sourceSets { "test" {} } -val jar = runtimeJar() - -ideaPlugin { - from(jar) -} +runtimeJar() diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 520ecc5b2c1..8659ed985c5 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -23,10 +23,6 @@ sourceSets { "test" {} } -val jar = runtimeJar {} +runtimeJar() dist(targetName = the().archivesBaseName + ".jar") - -ideaPlugin { - from(jar) -} diff --git a/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts index d4ed8a5db93..6cf72ec2b3e 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts @@ -23,6 +23,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() - diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts index 461a83e603a..16ec8879e77 100644 --- a/plugins/noarg/noarg-cli/build.gradle.kts +++ b/plugins/noarg/noarg-cli/build.gradle.kts @@ -30,16 +30,12 @@ sourceSets { "test" { projectDefault() } } -val jar = runtimeJar {} +runtimeJar() -testsJar {} +testsJar() dist(targetName = the().archivesBaseName.removePrefix("kotlin-") + ".jar") -ideaPlugin { - from(jar) -} - projectTest { workingDir = rootDir } diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts index b428cdd2f98..6e8731dc6af 100644 --- a/plugins/noarg/noarg-ide/build.gradle.kts +++ b/plugins/noarg/noarg-ide/build.gradle.kts @@ -27,5 +27,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts index 6abade7b284..9a0a3e42f9c 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts @@ -33,6 +33,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() - diff --git a/plugins/scripting/scripting-idea/build.gradle.kts b/plugins/scripting/scripting-idea/build.gradle.kts index 916fb5b3a6f..21e196a902d 100644 --- a/plugins/scripting/scripting-idea/build.gradle.kts +++ b/plugins/scripting/scripting-idea/build.gradle.kts @@ -20,6 +20,3 @@ sourceSets { } runtimeJar() - -ideaPlugin() - diff --git a/prepare/android-lint/build.gradle.kts b/prepare/android-lint/build.gradle.kts deleted file mode 100644 index d0523c06501..00000000000 --- a/prepare/android-lint/build.gradle.kts +++ /dev/null @@ -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() diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 30ac338aa7e..2d897de9b55 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -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() +)) // 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) diff --git a/settings.gradle b/settings.gradle index a3fdbbb8777..bbba3ba09c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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