Continue switching projects to improved dsl: sourceSets and test running

idea/idea-android/build.gradle.kts

@@ -1,12 +1,7 @@
+
 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(":kotlin-reflect"))
     compile(project(":compiler:util"))
     compile(project(":compiler:light-classes"))
@@ -47,14 +42,13 @@ dependencies {
     testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
 }
 
-configureKotlinProjectSourcesDefault()
-configureKotlinProjectTestsDefault()
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
 
-tasks.withType<Test> {
+projectTest {
     workingDir = rootDir
-    systemProperty("idea.is.unit.test", "true")
-    environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
-    ignoreFailures = true
 }
 
 testsJar {}

idea/idea-android/idea-android-output-parser/build.gradle.kts

@@ -2,13 +2,14 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    val compile by configurations
     compile(project(":compiler:util"))
     compile(ideaSdkCoreDeps("intellij-core"))
     compile(ideaPluginDeps("gradle-tooling-api", plugin = "gradle"))
     compile(ideaPluginDeps("android", "android-common", "sdk-common", plugin = "android"))
 }
 
-configureKotlinProjectSourcesDefault()
-configureKotlinProjectNoTests()
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}