From 05308a36527153a0a6b8f0fdcacc8b331c0659ad Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Wed, 18 Dec 2019 14:42:09 +0300
Subject: [PATCH] [FIR] Introduce module for all jvm extensions

---
 build.gradle.kts                               |  3 ++-
 compiler/cli/build.gradle.kts                  |  1 +
 compiler/fir/java/build.gradle.kts             |  1 +
 compiler/fir/jvm/build.gradle.kts              | 18 ++++++++++++++++++
 idea/build.gradle.kts                          |  1 +
 idea/idea-core/build.gradle.kts                |  1 +
 .../complexBuildGradleKts/build.gradle.kts     |  1 +
 prepare/idea-plugin/build.gradle.kts           |  1 +
 settings.gradle                                |  1 +
 9 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 compiler/fir/jvm/build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 8d80a0913ad..0e73909078d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -247,7 +247,8 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:psi2fir",
     ":compiler:fir:lightTree",
     ":compiler:fir:fir2ir",
-    ":compiler:fir:java"
+    ":compiler:fir:java",
+    ":compiler:fir:jvm"
 )
 
 val coreLibProjects = listOfNotNull(
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index fd5f396196f..e3fe15919dc 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
     compile(commonDep("org.jline", "jline"))
     compile(project(":compiler:fir:psi2fir"))
     compile(project(":compiler:fir:resolve"))
+    compile(project(":compiler:fir:jvm"))
     compile(project(":compiler:fir:java"))
     compile(project(":compiler:fir:fir2ir"))
     compile(toolsJar())
diff --git a/compiler/fir/java/build.gradle.kts b/compiler/fir/java/build.gradle.kts
index 378a2b8d36a..8a591a80cff 100644
--- a/compiler/fir/java/build.gradle.kts
+++ b/compiler/fir/java/build.gradle.kts
@@ -8,6 +8,7 @@ dependencies {
     compile(project(":compiler:frontend.common"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:fir:resolve"))
+    implementation(project(":compiler:fir:jvm"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
diff --git a/compiler/fir/jvm/build.gradle.kts b/compiler/fir/jvm/build.gradle.kts
new file mode 100644
index 00000000000..b097fe409a2
--- /dev/null
+++ b/compiler/fir/jvm/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+
+    implementation(project(":compiler:fir:cones"))
+    implementation(project(":compiler:fir:tree"))
+    implementation(project(":compiler:fir:resolve"))
+}
+
+
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
\ No newline at end of file
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 991fe3791e1..864ab94423f 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -82,6 +82,7 @@ dependencies {
     compile(project(":compiler:fir:fir2ir"))
     compile(project(":compiler:fir:resolve"))
     compile(project(":compiler:fir:java"))
+    compile(project(":compiler:fir:jvm"))
     compile(project(":idea:idea-core"))
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-jps-common"))
diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index 4278c94a670..dd65ff4d920 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
     compile(project(":compiler:fir:fir2ir"))
     compile(project(":compiler:fir:resolve"))
     compile(project(":compiler:fir:java"))
+    compile(project(":compiler:fir:jvm"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
 
diff --git a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
index f4772be68ec..94128aa439a 100644
--- a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
+++ b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
@@ -119,6 +119,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:psi2fir",
     ":compiler:fir:fir2ir",
     ":compiler:fir:java",
+    ":compiler:fir:jvm",
     ":compiler:frontend",
     ":compiler:frontend.common",
     ":compiler:frontend.java",
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index a9c9fca0ac3..a1e3fd37ed3 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -45,6 +45,7 @@ val projectsToShadow by extra(listOf(
         ":compiler:fir:resolve",
         ":compiler:fir:tree",
         ":compiler:fir:java",
+        ":compiler:fir:jvm",
         ":compiler:fir:psi2fir",
         ":compiler:fir:fir2ir",
         ":idea:fir-view",
diff --git a/settings.gradle b/settings.gradle
index 825e679e7fd..dd6d759c8de 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -89,6 +89,7 @@ include ":kotlin-build-common",
         ":compiler:fir:java",
         ":compiler:fir:modularized-tests",
         ":compiler:fir:dump",
+        ":compiler:fir:jvm",
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",