Continue switching projects to improved dsl: sourceSets and test running

compiler/cli/build.gradle.kts

@@ -2,7 +2,6 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    val compile by configurations
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
     compile(project(":compiler:frontend"))
@@ -22,11 +21,12 @@ dependencies {
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 }
 
-configureKotlinProjectSources("compiler/cli/src",
-                              "plugins/annotation-collector/src",
-                              "compiler/builtins-serializer/src",
-                              "compiler/javac-wrapper/src",
-                              sourcesBaseDir = rootDir)
-configureKotlinProjectResourcesDefault()
-configureKotlinProjectNoTests()
-
+sourceSets {
+    "main" {
+        projectDefault()
+        java.srcDirs("../../plugins/annotation-collector/src",
+                     "../builtins-serializer/src",
+                     "../javac-wrapper/src")
+    }
+    "test" {}
+}

compiler/cli/cli-common/build.gradle.kts

@@ -2,7 +2,6 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    val compile by configurations
     compile(project(":core:util.runtime"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
@@ -10,6 +9,8 @@ dependencies {
     compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
 }
 
-configureKotlinProjectSourcesDefault()
-configureKotlinProjectNoTests()
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
 

compiler/cli/cli-runner/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
 
 sourceSets {
     "main" { projectDefault() }
-    "test" { none() }
+    "test" {}
 }
 
 runtimeJar {