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

Fix 'fir:lightTree' build script to be able to run light tree tests

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-12-18 12:09:56 +03:00
parent 7abb3fc987
commit ebb1ca7cd9
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/lightTree/build.gradle.kts
+18 -8
View File
@@ -15,14 +15,24 @@ repositories {
} }
dependencies { dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
compile(project(":compiler:psi")) compile(project(":compiler:psi"))
compile(project(":compiler:fir:tree")) compile(project(":compiler:fir:tree"))
compile(project(":compiler:fir:psi2fir")) compile(project(":compiler:fir:psi2fir"))
testCompile("junit", "junit", "4.4") compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
testCompile(intellijDep())
testCompile(commonDep("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:fir:psi2fir")) testCompile(projectTests(":compiler:fir:psi2fir"))
testCompileOnly(project(":kotlin-reflect-api"))
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":core:descriptors.runtime"))
compile("org.openjdk.jmh", "jmh-core", jmhVersion) compile("org.openjdk.jmh", "jmh-core", jmhVersion)
compile("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion) compile("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion)
compile("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion) compile("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion)
@@ -71,12 +81,12 @@ val jmhBytecode by tasks.registering(JavaExec::class) {
) )
} }
tasks { //tasks {
compileTestJava { // compileTestJava {
source(fileTree("${project.buildDir}/generated-sources/jmh/")) // source(fileTree("${project.buildDir}/generated-sources/jmh/"))
destinationDir = file("${project.buildDir}/generated-classes/jmh/") // destinationDir = file("${project.buildDir}/generated-classes/jmh/")
} // }
} //}
val jmhCompile by tasks.registering(JavaCompile::class) { val jmhCompile by tasks.registering(JavaCompile::class) {
/*classpath = sourceSets["test"].runtimeClasspath + files("${project.buildDir}/generated-sources/jmh/") /*classpath = sourceSets["test"].runtimeClasspath + files("${project.buildDir}/generated-sources/jmh/")