Refactor: project renaming, using improved build dsl

compiler/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":compiler:daemon-common"))
     compileOnly(project(":compiler:incremental-compilation-impl"))
-    compileOnly(project(":build-common"))
+    compileOnly(project(":kotlin-build-common"))
     compileOnly(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
     compileOnly(commonDep("org.fusesource.jansi", "jansi"))
     compileOnly(commonDep("org.jline", "jline"))

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

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

compiler/compiler-runner/build.gradle.kts

@@ -3,7 +3,7 @@ apply { plugin("kotlin") }
 
 dependencies {
     val compile by configurations
-    compile(project(":build-common"))
+    compile(project(":kotlin-build-common"))
     compile(project(":compiler:cli-common"))
     compile(project(":kotlin-preloader"))
     compile(project(":compiler:frontend.java"))

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

@@ -3,24 +3,24 @@ description = "Kotlin Daemon Client"
 
 apply { plugin("kotlin") }
 
-val nativePlatformUberjar = "$rootDir/dependencies/native-platform-uberjar.jar"
+val nativePlatformUberjar = preloadedDeps("native-platform-uberjar")
 
 dependencies {
-    val compile by configurations
-    compile(project(":compiler:util"))
-    compile(project(":compiler:cli-common"))
-    compile(project(":compiler:daemon-common"))
-    compile(files(nativePlatformUberjar))
-    buildVersion()
+    compileOnly(project(":compiler:util"))
+    compileOnly(project(":compiler:cli-common"))
+    compileOnly(project(":compiler:daemon-common"))
+    compileOnly(nativePlatformUberjar)
 }
 
 sourceSets {
-    "main" { default() }
+    "main" { projectDefault() }
     "test" { none() }
 }
 
 runtimeJar {
-    from(zipTree(nativePlatformUberjar))
+    nativePlatformUberjar.forEach {
+        from(zipTree(it))
+    }
 }
 sourcesJar()
 

compiler/incremental-compilation-impl/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:cli"))
-    compile(project(":build-common"))
+    compile(project(":kotlin-build-common"))
 }
 
 configureKotlinProjectSourcesDefault()