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

2020-08-20 13:57:36 +03:00
parent 5fa80a2f8c
commit 864cf21f03
13 changed files with 1 additions and 30 deletions
@@ -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"))
 }
@@ -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"))
 }
@@ -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"
-}