diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 11820d441be..0b340ebef79 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { compileOnly(project(":core:util.runtime")) - compileOnly(project(":core:compiler.backend.common.jvm")) + compileOnly(project(":compiler:backend.common.jvm")) compileOnly(project(":compiler:util")) compileOnly(project(":compiler:cli-common")) compileOnly(project(":compiler:frontend.java")) diff --git a/build.gradle.kts b/build.gradle.kts index 0d4127350b2..054946f63d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -271,7 +271,7 @@ extra["compilerModules"] = arrayOf( ":core:deserialization.common.jvm", ":core:compiler.common", ":core:compiler.common.jvm", - ":core:compiler.backend.common.jvm", + ":compiler:backend.common.jvm", ":core:descriptors", ":core:descriptors.jvm", ":core:descriptors.runtime", diff --git a/core/compiler.backend.common.jvm/build.gradle.kts b/compiler/backend.common.jvm/build.gradle.kts similarity index 100% rename from core/compiler.backend.common.jvm/build.gradle.kts rename to compiler/backend.common.jvm/build.gradle.kts diff --git a/core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/AsmUtil.java similarity index 100% rename from core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/codegen/AsmUtil.java rename to compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/AsmUtil.java diff --git a/core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt similarity index 100% rename from core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt rename to compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt diff --git a/core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/codegen/signature/AsmTypeFactory.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/signature/AsmTypeFactory.kt similarity index 100% rename from core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/codegen/signature/AsmTypeFactory.kt rename to compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/signature/AsmTypeFactory.kt diff --git a/core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/AsmTypes.java b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/AsmTypes.java similarity index 100% rename from core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/AsmTypes.java rename to compiler/backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/AsmTypes.java diff --git a/core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/checkers/dalvikIdentifierUtils.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/checkers/dalvikIdentifierUtils.kt similarity index 100% rename from core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/checkers/dalvikIdentifierUtils.kt rename to compiler/backend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/checkers/dalvikIdentifierUtils.kt diff --git a/core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt similarity index 100% rename from core/compiler.backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt rename to compiler/backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts index 8d16aa0456b..4199ae4d030 100644 --- a/compiler/backend/build.gradle.kts +++ b/compiler/backend/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:serialization")) - api(project(":core:compiler.backend.common.jvm")) + api(project(":compiler:backend.common.jvm")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) } compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) } } diff --git a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts index a3235acadec..f6d3f662e16 100644 --- a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts +++ b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly(project(":core:descriptors")) - compileOnly(project(":core:compiler.backend.common.jvm")) + compileOnly(project(":compiler:backend.common.jvm")) compileOnly(project(":compiler:fir:cones")) compileOnly(project(":compiler:fir:resolve")) compileOnly(project(":compiler:fir:jvm")) diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts index 71f041f9231..d16921e1b49 100644 --- a/compiler/ir/backend.jvm/build.gradle.kts +++ b/compiler/ir/backend.jvm/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(project(":compiler:ir.psi2ir")) compile(project(":compiler:ir.backend.common")) compile(project(":compiler:ir.serialization.jvm")) - api(project(":core:compiler.backend.common.jvm")) + api(project(":compiler:backend.common.jvm")) compileOnly(project(":compiler:ir.tree.impl")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) } compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) } diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 3cd10c3b76c..35ca0ed37b6 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -16,7 +16,7 @@ val projectsToShadow by extra(listOf( ":compiler:backend", ":compiler:resolution.common.jvm", ":core:compiler.common.jvm", - ":core:compiler.backend.common.jvm", + ":compiler:backend.common.jvm", ":compiler:backend-common", ":compiler:backend.jvm", ":compiler:ir.backend.common", diff --git a/settings.gradle b/settings.gradle index 3579df6c52e..83774f8d42e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -137,7 +137,7 @@ include ":benchmarks", ":kotlin-jps-plugin", ":core:compiler.common", ":core:compiler.common.jvm", - ":core:compiler.backend.common.jvm", + ":compiler:backend.common.jvm", ":core:descriptors", ":core:descriptors.jvm", ":core:deserialization",