Reorganize builtins built and use in the projects

This commit is contained in:
Ilya Chernikov
2017-08-30 00:11:29 +03:00
parent d039d191f2
commit d89b53dfea
10 changed files with 14 additions and 85 deletions
+1 -1
View File
@@ -14,7 +14,6 @@ buildscript {
}
val projectsToShadow = listOf(
":core:builtins",
":plugins:annotation-based-compiler-plugins-ide-support",
":compiler:backend",
":compiler:backend-common",
@@ -56,6 +55,7 @@ val sideJars by configurations.creating
dependencies {
packedJars(commonDep("com.github.spullara.cli-parser", "cli-parser"))
packedJars(preloadedDeps("protobuf-${rootProject.extra["versions.protobuf-java"]}"))
packedJars(project(":kotlin-stdlib", configuration = "builtins"))
sideJars(projectDist(":kotlin-script-runtime"))
sideJars(commonDep("io.javaslang", "javaslang"))
sideJars(commonDep("javax.inject"))
@@ -33,6 +33,7 @@ tasks.withType<JavaCompile> {
}
val jar = runtimeJar {
dependsOn(":core:builtins:serialize")
from(fileTree("${rootProject.extra["distDir"]}/builtins")) { include("kotlin/**") }
}