From 12acbaaa21c941d705fbaec3662cded8f032e96e Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <simon.ogorodnik@jetbrains.com>
Date: Tue, 20 Mar 2018 01:17:40 +0300
Subject: [PATCH] FIR: Add module for new types aka 'cones' (of fir tree)

Start of KT-24063
---
 compiler/fir/cones/build.gradle.kts   | 22 ++++++++++++++++++++++
 compiler/fir/resolve/build.gradle.kts | 11 +----------
 compiler/fir/tree/build.gradle.kts    |  1 +
 settings.gradle                       |  1 +
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 compiler/fir/cones/build.gradle.kts

diff --git a/compiler/fir/cones/build.gradle.kts b/compiler/fir/cones/build.gradle.kts
new file mode 100644
index 00000000000..a208a014b85
--- /dev/null
+++ b/compiler/fir/cones/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+jvmTarget = "1.6"
+
+dependencies {
+    compile(project(":core:descriptors"))
+
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
\ No newline at end of file
diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts
index 88121d82e26..7ae7b8a7c91 100644
--- a/compiler/fir/resolve/build.gradle.kts
+++ b/compiler/fir/resolve/build.gradle.kts
@@ -1,13 +1,3 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
 /*
  * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
@@ -22,6 +12,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":core:descriptors"))
+    compile(project(":compiler:fir:cones"))
     compile(project(":compiler:fir:tree"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts
index df3820e4dcf..688481f92e8 100644
--- a/compiler/fir/tree/build.gradle.kts
+++ b/compiler/fir/tree/build.gradle.kts
@@ -14,6 +14,7 @@ val generatorClasspath by configurations.creating
 
 dependencies {
     compile(project(":core:descriptors"))
+    compile(project(":compiler:fir:cones"))
     generatorClasspath(project("visitors-generator"))
     // Necessary only to store bound PsiElement inside FirElement
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
diff --git a/settings.gradle b/settings.gradle
index 72fc7c8f8c0..1d21b327739 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,6 +28,7 @@ include ":kotlin-build-common",
         ":compiler:resolution",
         ":compiler:serialization",
         ":compiler:psi",
+        ":compiler:fir:cones",
         ":compiler:fir:tree",
         ":compiler:fir:tree:visitors-generator",
         ":compiler:fir:psi2fir",