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
@@ -6,9 +6,6 @@ apply { plugin("kotlin") }
//}
dependencies {
val compile by configurations
val testCompile by configurations
val testRuntime by configurations
compile(project(":kotlin-stdlib"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
@@ -42,20 +39,16 @@ dependencies {
// testRuntime(ideaPluginDeps("*.jar", plugin = "java-i18n"))
// testRuntime(ideaPluginDeps("*.jar", plugin = "coverage"))
// testRuntime(ideaPluginDeps("*.jar", plugin = "java-decompiler"))
buildVersion()
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectTestsDefault()
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
tasks.withType<Test> {
projectTest {
dependsOnTaskIfExistsRec("dist", project = rootProject)
jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1200m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true")
maxHeapSize = "1200m"
workingDir = rootDir
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}
testsJar()