Continue switching projects to improved dsl: sourceSets and test running

plugins/android-extensions/android-extensions-compiler/build.gradle.kts

@@ -4,7 +4,6 @@ description = "Kotlin Android Extensions Compiler"
 apply { plugin("kotlin") }
 
 dependencies {
-    val compile by configurations
     compile(ideaSdkCoreDeps("intellij-core"))
     compile(project(":compiler:util"))
     compile(project(":compiler:plugin-api"))
@@ -14,16 +13,12 @@ dependencies {
     compile(ideaPluginDeps("layoutlib", plugin = "android"))
 }
 
-configureKotlinProjectSources("android-extensions-compiler/src", "android-extensions-runtime/src", sourcesBaseDir = File(rootDir, "plugins", "android-extensions"))
-configureKotlinProjectResourcesDefault(sourcesBaseDir = File(rootDir, "plugins", "android-extensions", "android-extensions-compiler", "src"))
-configureKotlinProjectNoTests()
-
 sourceSets {
     "main" {
         projectDefault()
         java.srcDir("../android-extensions-runtime/src")
     }
-    "test" { none() }
+    "test" {}
 }
 
 runtimeJar ()

plugins/android-extensions/android-extensions-idea/build.gradle.kts

@@ -43,17 +43,15 @@ dependencies {
     testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
 }
 
-configureKotlinProjectSourcesDefault()
-configureKotlinProjectTestsDefault()
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
 
 testsJar {}
 
-
-tasks.withType<Test> {
+projectTest {
     workingDir = rootDir
-    systemProperty("idea.is.unit.test", "true")
-    environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
-    ignoreFailures = true
 }
 
 val jar: Jar by tasks

plugins/android-extensions/android-extensions-jps/build.gradle.kts

@@ -2,13 +2,14 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    val compile by configurations
     compile(project(":compiler:util"))
     compile(project(":jps-plugin"))
     compile(project(":android-extensions-compiler"))
     compile(ideaPluginDeps("android-jps-plugin", plugin = "android", subdir = "lib/jps"))
 }
 
-configureKotlinProjectSourcesDefault()
-configureKotlinProjectNoTests()
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}