azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix projects for gradle integration tests

Browse Source
This commit is contained in:
Ilya Chernikov
2017-09-13 19:40:15 +02:00
parent 8ec5cc7d16
commit 1862c78bdc
23 changed files with 185 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/compiler-runner/build.gradle.kts
+7 -13
View File
@@ -5,18 +5,14 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
val packIntoJar by configurations.creating
dependencies {
val compile by configurations
compile(project(":kotlin-build-common"))
compile(project(":compiler:cli-common"))
compile(project(":kotlin-preloader"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:daemon-common"))
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-preloader"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:daemon-common"))
compile(project(":kotlin-daemon-client"))
compile(project(":compiler:util"))
packIntoJar(projectClasses(":compiler:daemon-common"))
compileOnly(project(":compiler:util"))
}
sourceSets {
@@ -24,11 +20,9 @@ sourceSets {
"test" {}
}
evaluationDependsOn(":kotlin-daemon-client")
runtimeJar {
from(packIntoJar)
from(project(":kotlin-daemon-client").the<JavaPluginConvention>().sourceSets["main"].output.classesDirs)
from(getSourceSetsFrom(":kotlin-daemon-client")["main"].output.classesDirs)
from(getSourceSetsFrom(":compiler:daemon-common")["main"].output.classesDirs)
}
sourcesJar()
javadocJar()