Split core into descriptors, descriptors.jvm, deserialization, descriptors.runtime

compiler/android-tests/build.gradle.kts

@@ -13,7 +13,8 @@ dependencies {
     compile(ideaSdkDeps("openapi"))
 
     testCompile(project(":compiler:incremental-compilation-impl"))
-    testCompile(project(":core"))
+    testCompile(project(":core:descriptors"))
+    testCompile(project(":core:descriptors.jvm"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(projectTests(":jps-plugin"))
     testCompile(ideaSdkDeps("jps-model.jar", subdir = "jps"))

compiler/backend-common/build.gradle.kts

@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:ir.tree"))

compiler/daemon/daemon-common/build.gradle.kts

@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
     compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))

compiler/frontend.java/build.gradle.kts

@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
 }

compiler/frontend/build.gradle.kts

@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:deserialization"))
     compile(project(":compiler:util"))
     compile(project(":compiler:container"))
     compile(project(":compiler:resolution"))
@@ -16,4 +17,3 @@ sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-

compiler/incremental-compilation-impl/build.gradle.kts

@@ -4,7 +4,9 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
+    compile(project(":core:deserialization"))
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))

compiler/resolution/build.gradle.kts

@@ -5,11 +5,10 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":compiler:util"))
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-

compiler/serialization/build.gradle.kts

@@ -6,11 +6,11 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:deserialization"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-

compiler/tests-common/build.gradle.kts

@@ -2,8 +2,10 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    testCompile(project(":core"))
-    testCompile(project(":core::util.runtime"))
+    testCompile(project(":core:descriptors"))
+    testCompile(project(":core:descriptors.jvm"))
+    testCompile(project(":core:deserialization"))
+    testCompile(project(":core:descriptors.runtime"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:frontend"))

compiler/util/build.gradle.kts

@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(projectDist(":kotlin-stdlib"))
+    compile(project(":core:deserialization"))
     compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
     compile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
 }