Fix projects for gradle integration tests

compiler/build.gradle.kts

@@ -31,7 +31,7 @@ val testDistProjects = listOf(
         ":kotlin-test:kotlin-test-js",
         ":kotlin-daemon-client",
         ":kotlin-preloader",
-        ":android-extensions-compiler",
+        ":plugins:android-extensions-compiler",
         ":kotlin-ant")
 
 dependencies {

compiler/compiler-runner/build.gradle.kts

@@ -5,18 +5,14 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
-val packIntoJar by configurations.creating
-
 dependencies {
-    val compile by configurations
     compile(project(":kotlin-build-common"))
-    compile(project(":compiler:cli-common"))
-    compile(project(":kotlin-preloader"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":compiler:daemon-common"))
+    compileOnly(project(":compiler:cli-common"))
+    compileOnly(project(":kotlin-preloader"))
+    compileOnly(project(":compiler:frontend.java"))
+    compileOnly(project(":compiler:daemon-common"))
     compile(project(":kotlin-daemon-client"))
-    compile(project(":compiler:util"))
-    packIntoJar(projectClasses(":compiler:daemon-common"))
+    compileOnly(project(":compiler:util"))
 }
 
 sourceSets {
@@ -24,11 +20,9 @@ sourceSets {
     "test" {}
 }
 
-evaluationDependsOn(":kotlin-daemon-client")
-
 runtimeJar {
-    from(packIntoJar)
-    from(project(":kotlin-daemon-client").the<JavaPluginConvention>().sourceSets["main"].output.classesDirs)
+    from(getSourceSetsFrom(":kotlin-daemon-client")["main"].output.classesDirs)
+    from(getSourceSetsFrom(":compiler:daemon-common")["main"].output.classesDirs)
 }
 sourcesJar()
 javadocJar()

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

@@ -7,14 +7,11 @@ jvmTarget = "1.6"
 
 val nativePlatformUberjar = preloadedDeps("native-platform-uberjar")
 
-val packIntoJar by configurations.creating
-
 dependencies {
     compileOnly(project(":compiler:util"))
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":compiler:daemon-common"))
     compileOnly(nativePlatformUberjar)
-    packIntoJar(projectClasses(":compiler:daemon-common"))
 }
 
 sourceSets {
@@ -26,7 +23,7 @@ runtimeJar {
     nativePlatformUberjar.forEach {
         from(zipTree(it))
     }
-    from(packIntoJar)
+    from(getSourceSetsFrom(":compiler:daemon-common")["main"].output.classesDirs)
 }
 sourcesJar()
 javadocJar()

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

@@ -16,4 +16,3 @@ sourceSets {
     "test" {}
 }
 
-classesDirsArtifact()