From f7702d3e4341f58997d01d824b467ca440bf1ea9 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Wed, 9 Jan 2019 09:51:06 +0300
Subject: [PATCH] Create new core module: type-system

---
 build.gradle.kts                     |  3 ++-
 core/descriptors/build.gradle.kts    |  1 +
 core/type-system/build.gradle.kts    | 22 ++++++++++++++++++++++
 libraries/reflect/build.gradle.kts   |  1 +
 prepare/idea-plugin/build.gradle.kts |  1 +
 prepare/jps-plugin/build.gradle.kts  | 24 +++++++++++++-----------
 settings.gradle                      |  1 +
 7 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 core/type-system/build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index db0f76d32d5..ec5a2d72e2d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -225,7 +225,8 @@ extra["compilerModules"] = arrayOf(
         ":core:descriptors",
         ":core:descriptors.jvm",
         ":core:deserialization",
-        ":core:util.runtime"
+        ":core:util.runtime",
+        ":core:type-system"
 )
 
 val coreLibProjects = listOf(
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index 6a1dc2f0d39..a11d34aff30 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -8,6 +8,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:util.runtime"))
+    compile(project(":core:type-system"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))
 }
diff --git a/core/type-system/build.gradle.kts b/core/type-system/build.gradle.kts
new file mode 100644
index 00000000000..db3a3fa3c24
--- /dev/null
+++ b/core/type-system/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:util.runtime"))
+    compile(kotlinStdlib())
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}
\ No newline at end of file
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index a4e95e28a05..bc2809f21fe 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -53,6 +53,7 @@ dependencies {
     proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
     proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))
 
+    shadows(project(":core:type-system"))
     shadows(project(":kotlin-reflect-api"))
     shadows(project(":core:metadata"))
     shadows(project(":core:metadata.jvm"))
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index f057fa83f0c..0fcd7cf7a9d 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -14,6 +14,7 @@ repositories {
 // Do not rename, used in pill importer
 val projectsToShadow by extra(listOf(
         ":plugins:annotation-based-compiler-plugins-ide-support",
+        ":core:type-system",
         ":compiler:backend",
         ":compiler:backend-common",
         ":compiler:backend.jvm",
diff --git a/prepare/jps-plugin/build.gradle.kts b/prepare/jps-plugin/build.gradle.kts
index 73c2fee4a65..c80337acaee 100644
--- a/prepare/jps-plugin/build.gradle.kts
+++ b/prepare/jps-plugin/build.gradle.kts
@@ -8,17 +8,19 @@ plugins {
 }
 
 val projectsToShadow = listOf(
-        ":kotlin-build-common",
-        ":compiler:cli-common",
-        ":kotlin-compiler-runner",
-        ":compiler:daemon-common",
-        ":core:descriptors",
-        ":core:descriptors.jvm",
-        ":idea:idea-jps-common",
-        ":jps-plugin",
-        ":kotlin-preloader",
-        ":compiler:util",
-        ":core:util.runtime")
+    ":core:type-system",
+    ":kotlin-build-common",
+    ":compiler:cli-common",
+    ":kotlin-compiler-runner",
+    ":compiler:daemon-common",
+    ":core:descriptors",
+    ":core:descriptors.jvm",
+    ":idea:idea-jps-common",
+    ":jps-plugin",
+    ":kotlin-preloader",
+    ":compiler:util",
+    ":core:util.runtime"
+)
 
 dependencies {
     projectsToShadow.forEach {
diff --git a/settings.gradle b/settings.gradle
index c12cc2f0649..73e0ceaefc1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -67,6 +67,7 @@ include ":kotlin-build-common",
         ":jps-plugin",
         ":kotlin-jps-plugin",
         ":core:descriptors",
+        ":core:type-system",
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":core:descriptors.runtime",