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

core/descriptors.jvm/build.gradle.kts

@@ -0,0 +1,21 @@
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:descriptors"))
+    compile(project(":core:deserialization"))
+    compile(project(":core:util.runtime"))
+    compile(commonDep("javax.inject"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}

core/descriptors.runtime/build.gradle.kts

@@ -0,0 +1,20 @@
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:util.runtime"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}

core/descriptors/build.gradle.kts

@@ -0,0 +1,19 @@
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:util.runtime"))
+    compile(projectDist(":kotlin-stdlib"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}

core/deserialization/build.gradle.kts

@@ -1,5 +1,3 @@
-
-import org.gradle.api.tasks.compile.JavaCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 apply { plugin("kotlin") }
@@ -8,20 +6,14 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(projectDist(":kotlin-stdlib"))
-    compile(project("util.runtime"))
+    compile(project(":core:util.runtime"))
+    compile(project(":core:descriptors"))
     compile(protobufLite())
     compile(commonDep("javax.inject"))
 }
 
 sourceSets {
-    "main" {
-        java.srcDirs("descriptors/src",
-                     "descriptors.jvm/src",
-                     "descriptors.runtime/src",
-                     "deserialization/src")
-        resources.srcDirs("descriptors.jvm/src", "deserialization/src").apply { include("META-INF/**") }
-    }
+    "main" { projectDefault() }
     "test" {}
 }
 
@@ -34,5 +26,3 @@ tasks.withType<JavaCompile> {
 tasks.withType<KotlinCompile> {
     dependsOn(protobufLiteTask)
 }
-
-