Create new core module: type-system

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(

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"))
 }

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"
+}

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"))

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",

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 {

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",