From 54a5a066e84311a8b4a1aac9f0eedbd26199bc3b Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 22 Sep 2020 13:22:36 +0300
Subject: [PATCH] Introduce new module for common parts of backend utils

Mainly it needed for abstract jvm type mapper for different type systems:
  IrTypes and ConeKotlinTypes
---
 build-common/build.gradle.kts                     |  1 +
 build.gradle.kts                                  |  1 +
 compiler/backend/build.gradle.kts                 |  1 +
 compiler/ir/backend.jvm/build.gradle.kts          |  1 +
 core/compiler.backend.common.jvm/build.gradle.kts | 14 ++++++++++++++
 prepare/idea-plugin/build.gradle.kts              |  1 +
 settings.gradle                                   |  1 +
 7 files changed, 20 insertions(+)
 create mode 100644 core/compiler.backend.common.jvm/build.gradle.kts

diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts
index 25808b9ae8d..11820d441be 100644
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 
 dependencies {
     compileOnly(project(":core:util.runtime"))
+    compileOnly(project(":core: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 13126bec66f..0d4127350b2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -271,6 +271,7 @@ extra["compilerModules"] = arrayOf(
     ":core:deserialization.common.jvm",
     ":core:compiler.common",
     ":core:compiler.common.jvm",
+    ":core:compiler.backend.common.jvm",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":core:descriptors.runtime",
diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts
index edb8d913c04..8d16aa0456b 100644
--- a/compiler/backend/build.gradle.kts
+++ b/compiler/backend/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:serialization"))
+    api(project(":core:compiler.backend.common.jvm"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
     compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) }
 }
diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts
index aabd4663346..71f041f9231 100644
--- a/compiler/ir/backend.jvm/build.gradle.kts
+++ b/compiler/ir/backend.jvm/build.gradle.kts
@@ -10,6 +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"))
     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/core/compiler.backend.common.jvm/build.gradle.kts b/core/compiler.backend.common.jvm/build.gradle.kts
new file mode 100644
index 00000000000..2438fa03f8d
--- /dev/null
+++ b/core/compiler.backend.common.jvm/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    api(project(":core:compiler.common.jvm"))
+    api(intellijCoreDep()) { includeJars("asm-all", rootProject = rootProject) }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 44fb69d28af..3cd10c3b76c 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -16,6 +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",
         ":compiler:backend.jvm",
         ":compiler:ir.backend.common",
diff --git a/settings.gradle b/settings.gradle
index 7f0eaaa60db..3579df6c52e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -137,6 +137,7 @@ include ":benchmarks",
         ":kotlin-jps-plugin",
         ":core:compiler.common",
         ":core:compiler.common.jvm",
+        ":core:compiler.backend.common.jvm",
         ":core:descriptors",
         ":core:descriptors.jvm",
         ":core:deserialization",