Build: Put gradle tooling model in kotlin plugin as separate jars

Those jars are loaded by gradle during import process
This commit is contained in:
Vyacheslav Gerasimov
2019-04-15 21:33:40 +03:00
parent d6e2b5066b
commit f052f31c83
+14 -7
View File
@@ -69,7 +69,6 @@ val projectsToShadow by extra(listOf(
":compiler:serialization", ":compiler:serialization",
":compiler:util", ":compiler:util",
":core:util.runtime", ":core:util.runtime",
":allopen-ide-plugin",
":plugins:lint", ":plugins:lint",
":plugins:uast-kotlin", ":plugins:uast-kotlin",
":plugins:uast-kotlin-idea", ":plugins:uast-kotlin-idea",
@@ -82,24 +81,25 @@ val projectsToShadow by extra(listOf(
":kotlin-scripting-idea", ":kotlin-scripting-idea",
":kotlinx-serialization-compiler-plugin", ":kotlinx-serialization-compiler-plugin",
":kotlinx-serialization-ide-plugin", ":kotlinx-serialization-ide-plugin",
":noarg-ide-plugin",
":sam-with-receiver-ide-plugin",
":idea:idea-android", ":idea:idea-android",
":idea:idea-android-output-parser", ":idea:idea-android-output-parser",
":idea:idea-jvm", ":idea:idea-jvm",
":idea:idea-git", ":idea:idea-git",
":idea:idea-jps-common", ":idea:idea-jps-common",
":idea:kotlin-gradle-tooling",
":plugins:android-extensions-compiler", ":plugins:android-extensions-compiler",
":plugins:android-extensions-ide",
":plugins:kapt3-idea",
*if (Ide.IJ()) *if (Ide.IJ())
arrayOf(":idea:idea-maven") arrayOf(":idea:idea-maven")
else else
emptyArray<String>() emptyArray<String>()
)) ))
val libraries by configurations.creating // Gradle tooling model jars are loaded into Gradle during import and should present in plugin as separate jar
val gradleToolingModel by configurations.creating
val libraries by configurations.creating {
extendsFrom(gradleToolingModel)
}
val jpsPlugin by configurations.creating val jpsPlugin by configurations.creating
configurations.all { configurations.all {
@@ -134,6 +134,13 @@ dependencies {
libraries(project(":kotlin-scripting-intellij")) libraries(project(":kotlin-scripting-intellij"))
libraries(project(":kotlin-scripting-jvm")) libraries(project(":kotlin-scripting-jvm"))
gradleToolingModel(project(":idea:kotlin-gradle-tooling")) { isTransitive = false }
gradleToolingModel(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
gradleToolingModel(project(":plugins:kapt3-idea")) { isTransitive = false }
gradleToolingModel(project(":plugins:android-extensions-ide")) { isTransitive = false }
gradleToolingModel(project(":noarg-ide-plugin")) { isTransitive = false }
gradleToolingModel(project(":allopen-ide-plugin")) { isTransitive = false }
jpsPlugin(project(":kotlin-jps-plugin")) jpsPlugin(project(":kotlin-jps-plugin"))
} }