Extract module 'config.jvm' out of 'frontend.java'

This allows to get rid of dependency cli.common -> frontend.java.
This commit is contained in:
Alexander Udalov
2020-03-14 23:14:04 +01:00
committed by Alexander Udalov
parent 90ae416b72
commit 15d2a06132
14 changed files with 21 additions and 2 deletions
+1
View File
@@ -208,6 +208,7 @@ extra["IntellijCoreDependencies"] =
extra["compilerModules"] = arrayOf( extra["compilerModules"] = arrayOf(
":compiler:util", ":compiler:util",
":compiler:config.jvm",
":compiler:container", ":compiler:container",
":compiler:resolution", ":compiler:resolution",
":compiler:serialization", ":compiler:serialization",
+1 -2
View File
@@ -1,4 +1,3 @@
plugins { plugins {
kotlin("jvm") kotlin("jvm")
id("jps-compatible") id("jps-compatible")
@@ -7,7 +6,7 @@ plugins {
dependencies { dependencies {
compile(project(":core:util.runtime")) compile(project(":core:util.runtime"))
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java")) compile(project(":compiler:config.jvm"))
compile(project(":js:js.frontend")) compile(project(":js:js.frontend"))
compileOnly(project(":kotlin-reflect-api")) compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+15
View File
@@ -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" { }
}
+1
View File
@@ -7,6 +7,7 @@ dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm")) compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:config.jvm"))
compile("javax.annotation:jsr250-api:1.0") compile("javax.annotation:jsr250-api:1.0")
compile(project(":compiler:frontend")) compile(project(":compiler:frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+1
View File
@@ -73,6 +73,7 @@ val projectsToShadow by extra(listOf(
":compiler:resolution", ":compiler:resolution",
":compiler:serialization", ":compiler:serialization",
":compiler:util", ":compiler:util",
":compiler:config.jvm",
":compiler:compiler.version", ":compiler:compiler.version",
":core:util.runtime", ":core:util.runtime",
":plugins:lint", ":plugins:lint",
+1
View File
@@ -20,6 +20,7 @@ val projectsToShadow = listOf(
":jps-plugin", ":jps-plugin",
":kotlin-preloader", ":kotlin-preloader",
":compiler:util", ":compiler:util",
":compiler:config.jvm",
":core:util.runtime", ":core:util.runtime",
":compiler:compiler.version" ":compiler:compiler.version"
) )
+1
View File
@@ -59,6 +59,7 @@ include ":kotlin-build-common",
":benchmarks", ":benchmarks",
":compiler", ":compiler",
":compiler:util", ":compiler:util",
":compiler:config.jvm",
":kotlin-util-io", ":kotlin-util-io",
":kotlin-util-klib", ":kotlin-util-klib",
":kotlin-util-klib-metadata", ":kotlin-util-klib-metadata",