Reorganize builtins built and use in the projects
This commit is contained in:
@@ -1,14 +1,8 @@
|
||||
|
||||
import org.gradle.api.tasks.compile.JavaCompile
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer
|
||||
import org.gradle.jvm.tasks.Jar
|
||||
import java.io.File
|
||||
|
||||
apply { plugin("kotlin") }
|
||||
|
||||
jvmTarget = "1.6"
|
||||
|
||||
val builtinsSrc = File(rootDir, "core", "builtins", "src")
|
||||
val builtinsNative = File(rootDir, "core", "builtins", "native")
|
||||
// TODO: rewrite dependent projects on using build results instead of the fixed location
|
||||
@@ -16,20 +10,6 @@ val builtinsSerialized = File(rootProject.extra["distDir"].toString(), "builtins
|
||||
|
||||
val builtins by configurations.creating
|
||||
|
||||
dependencies {
|
||||
compile(protobufLite())
|
||||
compile(files(builtinsSerialized))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
"main" {
|
||||
projectDefault()
|
||||
java.srcDir("../runtime.jvm/src")
|
||||
resources.srcDir(builtinsSerialized).apply { include("**") }
|
||||
}
|
||||
"test" {}
|
||||
}
|
||||
|
||||
val serialize = task("serialize") {
|
||||
val outDir = builtinsSerialized
|
||||
val inDirs = arrayOf(builtinsSrc, builtinsNative)
|
||||
@@ -44,22 +24,6 @@ val serialize = task("serialize") {
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType<JavaCompile> {
|
||||
dependsOn(protobufLiteTask)
|
||||
dependsOn(serialize)
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile> {
|
||||
dependsOn(protobufLiteTask)
|
||||
dependsOn(serialize)
|
||||
}
|
||||
|
||||
val jar: Jar by tasks
|
||||
jar.apply {
|
||||
dependsOn(serialize)
|
||||
from(builtinsSerialized) { include("kotlin/**") }
|
||||
}
|
||||
|
||||
val builtinsJar by task<Jar> {
|
||||
dependsOn(serialize)
|
||||
from(builtinsSerialized) { include("kotlin/**") }
|
||||
|
||||
Reference in New Issue
Block a user