Extract module 'config' out of 'frontend'

Also move deprecated TargetPlatform there. This allows to get rid of the
dependency cli.common -> frontend, and even on frontend.common.
This commit is contained in:
Alexander Udalov
2020-03-15 00:00:33 +01:00
committed by Alexander Udalov
parent 143aef938b
commit 4dcd0d1cb6
14 changed files with 23 additions and 4 deletions
+1
View File
@@ -208,6 +208,7 @@ extra["IntellijCoreDependencies"] =
extra["compilerModules"] = arrayOf( extra["compilerModules"] = arrayOf(
":compiler:util", ":compiler:util",
":compiler:config",
":compiler:config.jvm", ":compiler:config.jvm",
":compiler:container", ":compiler:container",
":compiler:resolution", ":compiler:resolution",
+1 -1
View File
@@ -5,7 +5,7 @@ plugins {
dependencies { dependencies {
compile(project(":core:util.runtime")) compile(project(":core:util.runtime"))
compile(project(":compiler:frontend")) compile(project(":compiler:config"))
compile(project(":compiler:config.jvm")) compile(project(":compiler:config.jvm"))
compile(project(":js:js.config")) compile(project(":js:js.config"))
compileOnly(project(":kotlin-reflect-api")) compileOnly(project(":kotlin-reflect-api"))
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
} }
dependencies { dependencies {
api(project(":compiler:frontend")) api(project(":compiler:config"))
api(project(":core:descriptors.jvm")) api(project(":core:descriptors.jvm"))
compileOnly(intellijCoreDep()) { includeJars("asm-all", rootProject = rootProject) } compileOnly(intellijCoreDep()) { includeJars("asm-all", rootProject = rootProject) }
} }
+15
View File
@@ -0,0 +1,15 @@
plugins {
kotlin("jvm")
id("jps-compatible")
}
dependencies {
api(project(":core:descriptors"))
api(project(":compiler:util"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
+1 -1
View File
@@ -1,4 +1,3 @@
plugins { plugins {
kotlin("jvm") kotlin("jvm")
id("jps-compatible") id("jps-compatible")
@@ -9,6 +8,7 @@ dependencies {
compile(project(":core:descriptors")) compile(project(":core:descriptors"))
compile(project(":core:deserialization")) compile(project(":core:deserialization"))
compile(project(":compiler:util")) compile(project(":compiler:util"))
compile(project(":compiler:config"))
compile(project(":compiler:container")) compile(project(":compiler:container"))
compile(project(":compiler:resolution")) compile(project(":compiler:resolution"))
compile(project(":compiler:psi")) compile(project(":compiler:psi"))
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
} }
dependencies { dependencies {
api(project(":compiler:frontend.common")) api(project(":compiler:config"))
} }
sourceSets { sourceSets {
+1
View File
@@ -74,6 +74,7 @@ val projectsToShadow by extra(listOf(
":compiler:resolution", ":compiler:resolution",
":compiler:serialization", ":compiler:serialization",
":compiler:util", ":compiler:util",
":compiler:config",
":compiler:config.jvm", ":compiler:config.jvm",
":compiler:compiler.version", ":compiler:compiler.version",
":core:util.runtime", ":core:util.runtime",
+1
View File
@@ -20,6 +20,7 @@ val projectsToShadow = listOf(
":jps-plugin", ":jps-plugin",
":kotlin-preloader", ":kotlin-preloader",
":compiler:util", ":compiler:util",
":compiler:config",
":compiler:config.jvm", ":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",
":compiler:config.jvm", ":compiler:config.jvm",
":kotlin-util-io", ":kotlin-util-io",
":kotlin-util-klib", ":kotlin-util-klib",