Continue switching projects to improved dsl: sourceSets and test running

This commit is contained in:
Ilya Chernikov
2017-08-21 20:53:48 +02:00
parent 336e24b837
commit deda50dbbb
76 changed files with 372 additions and 614 deletions
+5 -12
View File
@@ -2,11 +2,6 @@
apply { plugin("kotlin") }
dependencies {
val compile by configurations
val compileOnly by configurations
val testCompile by configurations
val testCompileOnly by configurations
val testRuntime by configurations
compile(project(":core:util.runtime"))
compile(commonDep("javax.inject"))
compile(ideaSdkCoreDeps("intellij-core"))
@@ -15,17 +10,15 @@ dependencies {
testRuntime(ideaSdkCoreDeps("trove4j", "intellij-core"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectTestsDefault()
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
testsJar {}
tasks.withType<Test> {
projectTest {
dependsOnTaskIfExistsRec("dist", project = rootProject)
dependsOn(":prepare:mock-runtime-for-test:dist")
workingDir = rootDir
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}