Refactoring - renaming projects, applying sourceSets DSL

compiler/build.gradle.kts

@@ -32,8 +32,8 @@ dependencies {
     testCompile(project(":kotlin-script-runtime"))
     testCompile(project(":kotlin-runtime"))
     testCompile(project(":kotlin-reflect"))
-    testCompile(project(":plugins:android-extensions-compiler"))
-    testCompile(project(":ant"))
+    testCompile(project(":android-extensions-compiler"))
+    testCompile(project(":kotlin-ant"))
     otherCompilerModules.forEach {
         testCompile(project(it))
     }

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

@@ -1,5 +1,5 @@
 
-import org.gradle.jvm.tasks.Jar
+description = "Kotlin Runner"
 
 apply { plugin("kotlin") }
 
@@ -9,18 +9,15 @@ dependencies {
     buildVersion()
 }
 
-configureKotlinProjectSourcesDefault()
-configureKotlinProjectNoTests()
+sourceSets {
+    "main" { default() }
+    "test" { none() }
+}
 
-val jar: Jar by tasks
-jar.apply {
-    setupRuntimeJar("Kotlin Runner")
+runtimeJar {
     manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.runner.Main")
     manifest.attributes.put("Class-Path", "kotlin-runtime.jar")
-    archiveName = "kotlin-runner.jar"
 }
 
-dist {
-    from(jar)
-}
+dist()
 

compiler/compiler-runner/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     compile(project(":kotlin-preloader"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:daemon-common"))
-    compile(project(":compiler:daemon-client"))
+    compile(project(":kotlin-daemon-client"))
     compile(project(":compiler:util"))
 }
 

compiler/daemon/daemon-client/build.gradle.kts

@@ -1,5 +1,5 @@
 
-import org.gradle.jvm.tasks.Jar
+description = "Kotlin Daemon Client"
 
 apply { plugin("kotlin") }
 
@@ -14,22 +14,15 @@ dependencies {
     buildVersion()
 }
 
-configureKotlinProjectSourcesDefault()
-configureKotlinProjectNoTests()
+sourceSets {
+    "main" { default() }
+    "test" { none() }
+}
 
-val jar: Jar by tasks
-jar.apply {
-    setupRuntimeJar("Kotlin Daemon Client")
+runtimeJar {
     from(zipTree(nativePlatformUberjar))
-    archiveName = "kotlin-daemon-client.jar"
 }
+sourcesJar()
 
-val sourcesJar by task<Jar> {
-    setupSourceJar("Kotlin Daemon Client")
-    archiveName = "kotlin-daemon-client-sources.jar"
-}
-
-dist {
-    from(jar)
-}
+dist()