From 15d2a061326f0010211667b87f0ac6a7b93facf2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 14 Mar 2020 23:14:04 +0100 Subject: [PATCH] Extract module 'config.jvm' out of 'frontend.java' This allows to get rid of dependency cli.common -> frontend.java. --- build.gradle.kts | 1 + compiler/cli/cli-common/build.gradle.kts | 3 +-- compiler/config.jvm/build.gradle.kts | 15 +++++++++++++++ .../jetbrains/kotlin/config/JVMAssertionsMode.kt | 0 .../kotlin/config/JVMConfigurationKeys.java | 0 .../config/JVMConstructorCallNormalizationMode.kt | 0 .../jetbrains/kotlin/config/JvmAnalysisFlags.kt | 0 .../src/org/jetbrains/kotlin/config/JvmTarget.kt | 0 .../jetbrains/kotlin/platform/jvm/JvmPlatform.kt | 0 .../kotlin/resolve/jvm/platform/JvmPlatform.kt | 0 compiler/frontend.java/build.gradle.kts | 1 + prepare/idea-plugin/build.gradle.kts | 1 + prepare/jps-plugin/build.gradle.kts | 1 + settings.gradle | 1 + 14 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 compiler/config.jvm/build.gradle.kts rename compiler/{frontend.java => config.jvm}/src/org/jetbrains/kotlin/config/JVMAssertionsMode.kt (100%) rename compiler/{frontend.java => config.jvm}/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java (100%) rename compiler/{frontend.java => config.jvm}/src/org/jetbrains/kotlin/config/JVMConstructorCallNormalizationMode.kt (100%) rename compiler/{frontend.java => config.jvm}/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt (100%) rename compiler/{frontend.java => config.jvm}/src/org/jetbrains/kotlin/config/JvmTarget.kt (100%) rename compiler/{frontend.java => config.jvm}/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt (100%) rename compiler/{frontend.java => config.jvm}/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 63ca98a8b29..b606004f941 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -208,6 +208,7 @@ extra["IntellijCoreDependencies"] = extra["compilerModules"] = arrayOf( ":compiler:util", + ":compiler:config.jvm", ":compiler:container", ":compiler:resolution", ":compiler:serialization", diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index e8d297f12a4..b6a8e49f9cf 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -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") } diff --git a/compiler/config.jvm/build.gradle.kts b/compiler/config.jvm/build.gradle.kts new file mode 100644 index 00000000000..8fb9e79bc03 --- /dev/null +++ b/compiler/config.jvm/build.gradle.kts @@ -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" { } +} diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMAssertionsMode.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMAssertionsMode.kt similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMAssertionsMode.kt rename to compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMAssertionsMode.kt diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java rename to compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConstructorCallNormalizationMode.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConstructorCallNormalizationMode.kt similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConstructorCallNormalizationMode.kt rename to compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConstructorCallNormalizationMode.kt diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt rename to compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JvmTarget.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/kotlin/config/JvmTarget.kt rename to compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt rename to compiler/config.jvm/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt rename to compiler/config.jvm/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index 2f69c936ef7..971942372e0 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -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") } diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 799dcf2a13f..2d2a1ae519c 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -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", diff --git a/prepare/jps-plugin/build.gradle.kts b/prepare/jps-plugin/build.gradle.kts index fc5db5c3b3c..3f514ae295a 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.jvm", ":core:util.runtime", ":compiler:compiler.version" ) diff --git a/settings.gradle b/settings.gradle index 7cefcd2e2b9..3162b27e98c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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",