Merge :core:type-system into :core:descriptors.common

build.gradle.kts

@@ -271,7 +271,6 @@ extra["compilerModules"] = arrayOf(
     ":core:descriptors.runtime",
     ":core:deserialization",
     ":core:util.runtime",
-    ":core:type-system",
     ":compiler:fir:cones",
     ":compiler:fir:resolve",
     ":compiler:fir:fir-serialization",
@@ -288,7 +287,6 @@ extra["compilerModules"] = arrayOf(
 )
 
 extra["compilerModulesForJps"] = listOf(
-    ":core:type-system",
     ":kotlin-build-common",
     ":kotlin-util-io",
     ":kotlin-util-klib",

core/descriptors.common/build.gradle.kts

@@ -8,7 +8,6 @@ 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/descriptors/build.gradle.kts

@@ -9,7 +9,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
     compile(project(":core:descriptors.common"))
     compile(project(":core:util.runtime"))
-    compile(project(":core:type-system"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))
 }

core/type-system/build.gradle.kts

@@ -1,22 +0,0 @@
-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"
-}

idea/idea-frontend-api/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
 
     compileOnly(project(":compiler:psi"))
     compileOnly(project(":compiler:frontend"))
-    compileOnly(project(":core:type-system"))
+    compileOnly(project(":core:descriptors.common"))
     compileOnly(project(":idea:idea-frontend-independent"))
     compileOnly(project(":compiler:psi"))
     compileOnly(intellijCoreDep())

libraries/reflect/build.gradle.kts

@@ -44,7 +44,6 @@ dependencies {
     proguardDeps(kotlinStdlib())
     proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
 
-    embedded(project(":core:type-system"))
     embedded(project(":kotlin-reflect-api"))
     embedded(project(":core:metadata"))
     embedded(project(":core:metadata.jvm"))

prepare/idea-plugin/build.gradle.kts

@@ -13,7 +13,6 @@ repositories {
 // PILL: 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",

settings.gradle

@@ -135,7 +135,6 @@ include ":benchmarks",
         ":kotlin-jps-plugin",
         ":core:descriptors.common",
         ":core:descriptors",
-        ":core:type-system",
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":core:descriptors.runtime",