Extract module 'config.jvm' out of 'frontend.java'
This allows to get rid of dependency cli.common -> frontend.java.
This commit is contained in:
committed by
Alexander Udalov
parent
90ae416b72
commit
15d2a06132
@@ -208,6 +208,7 @@ extra["IntellijCoreDependencies"] =
|
||||
|
||||
extra["compilerModules"] = arrayOf(
|
||||
":compiler:util",
|
||||
":compiler:config.jvm",
|
||||
":compiler:container",
|
||||
":compiler:resolution",
|
||||
":compiler:serialization",
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
plugins {
|
||||
kotlin("jvm")
|
||||
id("jps-compatible")
|
||||
@@ -7,7 +6,7 @@ plugins {
|
||||
dependencies {
|
||||
compile(project(":core:util.runtime"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
compile(project(":compiler:config.jvm"))
|
||||
compile(project(":js:js.frontend"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
plugins {
|
||||
kotlin("jvm")
|
||||
id("jps-compatible")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":core:descriptors.jvm"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("asm-all", rootProject = rootProject) }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
"main" { projectDefault() }
|
||||
"test" { }
|
||||
}
|
||||
@@ -7,6 +7,7 @@ dependencies {
|
||||
compile(project(":core:descriptors"))
|
||||
compile(project(":core:descriptors.jvm"))
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:config.jvm"))
|
||||
compile("javax.annotation:jsr250-api:1.0")
|
||||
compile(project(":compiler:frontend"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
@@ -73,6 +73,7 @@ val projectsToShadow by extra(listOf(
|
||||
":compiler:resolution",
|
||||
":compiler:serialization",
|
||||
":compiler:util",
|
||||
":compiler:config.jvm",
|
||||
":compiler:compiler.version",
|
||||
":core:util.runtime",
|
||||
":plugins:lint",
|
||||
|
||||
@@ -20,6 +20,7 @@ val projectsToShadow = listOf(
|
||||
":jps-plugin",
|
||||
":kotlin-preloader",
|
||||
":compiler:util",
|
||||
":compiler:config.jvm",
|
||||
":core:util.runtime",
|
||||
":compiler:compiler.version"
|
||||
)
|
||||
|
||||
@@ -59,6 +59,7 @@ include ":kotlin-build-common",
|
||||
":benchmarks",
|
||||
":compiler",
|
||||
":compiler:util",
|
||||
":compiler:config.jvm",
|
||||
":kotlin-util-io",
|
||||
":kotlin-util-klib",
|
||||
":kotlin-util-klib-metadata",
|
||||
|
||||
Reference in New Issue
Block a user