From 4dcd0d1cb6c03a4005b16371636ab0e8618aec98 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 15 Mar 2020 00:00:33 +0100 Subject: [PATCH] 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. --- build.gradle.kts | 1 + compiler/cli/cli-common/build.gradle.kts | 2 +- compiler/config.jvm/build.gradle.kts | 2 +- compiler/config/build.gradle.kts | 15 +++++++++++++++ .../org/jetbrains/kotlin/config/AnalysisFlags.kt | 0 .../kotlin/config/CommonConfigurationKeys.kt | 0 .../kotlin/config/CompilerConfiguration.java | 0 .../kotlin/config/CompilerConfigurationKey.java | 0 .../jetbrains/kotlin/resolve/TargetPlatform.kt | 0 compiler/frontend/build.gradle.kts | 2 +- js/js.config/build.gradle.kts | 2 +- prepare/idea-plugin/build.gradle.kts | 1 + prepare/jps-plugin/build.gradle.kts | 1 + settings.gradle | 1 + 14 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 compiler/config/build.gradle.kts rename compiler/{frontend => config}/src/org/jetbrains/kotlin/config/AnalysisFlags.kt (100%) rename compiler/{frontend => config}/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt (100%) rename compiler/{frontend => config}/src/org/jetbrains/kotlin/config/CompilerConfiguration.java (100%) rename compiler/{frontend => config}/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.java (100%) rename compiler/{frontend.common => config}/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index eb183a58272..0843e16ca52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -208,6 +208,7 @@ extra["IntellijCoreDependencies"] = extra["compilerModules"] = arrayOf( ":compiler:util", + ":compiler:config", ":compiler:config.jvm", ":compiler:container", ":compiler:resolution", diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 23a00268c2c..4fb00c558a6 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { compile(project(":core:util.runtime")) - compile(project(":compiler:frontend")) + compile(project(":compiler:config")) compile(project(":compiler:config.jvm")) compile(project(":js:js.config")) compileOnly(project(":kotlin-reflect-api")) diff --git a/compiler/config.jvm/build.gradle.kts b/compiler/config.jvm/build.gradle.kts index 8fb9e79bc03..2f2a7e3ce42 100644 --- a/compiler/config.jvm/build.gradle.kts +++ b/compiler/config.jvm/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(project(":compiler:frontend")) + api(project(":compiler:config")) api(project(":core:descriptors.jvm")) compileOnly(intellijCoreDep()) { includeJars("asm-all", rootProject = rootProject) } } diff --git a/compiler/config/build.gradle.kts b/compiler/config/build.gradle.kts new file mode 100644 index 00000000000..c5132853e9c --- /dev/null +++ b/compiler/config/build.gradle.kts @@ -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" {} +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/AnalysisFlags.kt b/compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt similarity index 100% rename from compiler/frontend/src/org/jetbrains/kotlin/config/AnalysisFlags.kt rename to compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt b/compiler/config/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt similarity index 100% rename from compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt rename to compiler/config/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java b/compiler/config/src/org/jetbrains/kotlin/config/CompilerConfiguration.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java rename to compiler/config/src/org/jetbrains/kotlin/config/CompilerConfiguration.java diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.java b/compiler/config/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.java rename to compiler/config/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.java diff --git a/compiler/frontend.common/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt b/compiler/config/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt similarity index 100% rename from compiler/frontend.common/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt rename to compiler/config/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index 170d6e3e2a2..53b465583cb 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("jvm") id("jps-compatible") @@ -9,6 +8,7 @@ dependencies { compile(project(":core:descriptors")) compile(project(":core:deserialization")) compile(project(":compiler:util")) + compile(project(":compiler:config")) compile(project(":compiler:container")) compile(project(":compiler:resolution")) compile(project(":compiler:psi")) diff --git a/js/js.config/build.gradle.kts b/js/js.config/build.gradle.kts index ef2b712c5f3..f36c770a132 100644 --- a/js/js.config/build.gradle.kts +++ b/js/js.config/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(project(":compiler:frontend.common")) + api(project(":compiler:config")) } sourceSets { diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index d8cad418cbe..840778ec55e 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -74,6 +74,7 @@ val projectsToShadow by extra(listOf( ":compiler:resolution", ":compiler:serialization", ":compiler:util", + ":compiler:config", ":compiler:config.jvm", ":compiler:compiler.version", ":core:util.runtime", diff --git a/prepare/jps-plugin/build.gradle.kts b/prepare/jps-plugin/build.gradle.kts index 3f514ae295a..6c6c9a5a818 100644 --- a/prepare/jps-plugin/build.gradle.kts +++ b/prepare/jps-plugin/build.gradle.kts @@ -20,6 +20,7 @@ val projectsToShadow = listOf( ":jps-plugin", ":kotlin-preloader", ":compiler:util", + ":compiler:config", ":compiler:config.jvm", ":core:util.runtime", ":compiler:compiler.version" diff --git a/settings.gradle b/settings.gradle index 0130297ca7e..6140503b47c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -59,6 +59,7 @@ include ":kotlin-build-common", ":benchmarks", ":compiler", ":compiler:util", + ":compiler:config", ":compiler:config.jvm", ":kotlin-util-io", ":kotlin-util-klib",