Continue switching projects to improved dsl: sourceSets and test running

2017-08-21 20:53:48 +02:00
parent 336e24b837
commit deda50dbbb
76 changed files with 372 additions and 614 deletions
@@ -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" {}
+}