Fix tests in the new build infrastructure

prepare/compiler-client-embeddable/build.gradle.kts

@@ -35,11 +35,11 @@ dependencies {
         testCompile(project(it))
     }
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testRuntimeCompilerJar(project(":kotlin-compiler", configuration = "runtimeJar"))
-    testStdlibJar(project(":kotlin-stdlib", configuration = "mainJar"))
-    testScriptRuntimeJar(project(":kotlin-script-runtime", configuration = "mainJar"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
+    testRuntimeCompilerJar(projectDist(":kotlin-compiler"))
+    testStdlibJar(projectDist(":kotlin-stdlib"))
+    testScriptRuntimeJar(projectDist(":kotlin-script-runtime"))
 }
 
 sourceSets {

prepare/compiler-embeddable/build.gradle.kts

@@ -30,7 +30,7 @@ val packagesToRelocate =
                "org.fusesource")
 
 dependencies {
-    compilerJar(project(":kotlin-compiler", configuration = "runtimeJar"))
+    compilerJar(projectDist(":kotlin-compiler"))
 }
 
 runtimeJar(task<ShadowJar>("embeddable")) {

prepare/compiler/build.gradle.kts

@@ -88,9 +88,9 @@ dependencies {
     proguardLibraryJars(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar"),
             firstFromJavaHomeThatExists("lib/jsse.jar", "../Classes/jsse.jar"),
             firstFromJavaHomeThatExists("../lib/tools.jar", "../Classes/tools.jar")))
-    proguardLibraryJars(project(":kotlin-stdlib", configuration = "mainJar"))
-    proguardLibraryJars(project(":kotlin-script-runtime", configuration = "mainJar"))
-    proguardLibraryJars(project(":kotlin-reflect", configuration = "mainJar"))
+    proguardLibraryJars(projectDist(":kotlin-stdlib"))
+    proguardLibraryJars(projectDist(":kotlin-script-runtime"))
+    proguardLibraryJars(projectDist(":kotlin-reflect"))
     proguardLibraryJars(preloadedDeps("kotlinx-coroutines-core"))
 }
 
@@ -98,7 +98,6 @@ val packCompiler by task<ShadowJar> {
     configurations = listOf(fatJar)
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     destinationDir = File(buildDir, "libs")
-//    baseName = compilerBaseName
     dependsOn(protobufFullTask)
 
     setupPublicJar("before-proguard", "")
@@ -130,14 +129,9 @@ val proguard by task<ProGuardTask> {
     printconfiguration("$buildDir/compiler.pro.dump")
 }
 
-dist {
-    if (shrink) {
-        from(proguard)
-    } else {
-        from(packCompiler)
-    }
-    rename(".*", compilerBaseName + ".jar")
-}
+dist(targetName = compilerBaseName + ".jar",
+     fromTask = if (shrink) proguard
+                else packCompiler)
 
 runtimeJarArtifactBy(proguard, proguard.outputs.files.singleFile) {
     name = compilerBaseName

prepare/kotlin-plugin/build.gradle.kts

@@ -56,7 +56,7 @@ val sideJars by configurations.creating
 dependencies {
     packedJars(commonDep("com.github.spullara.cli-parser", "cli-parser"))
     packedJars(preloadedDeps("protobuf-${rootProject.extra["versions.protobuf-java"]}"))
-    sideJars(project(":kotlin-script-runtime"))
+    sideJars(projectDist(":kotlin-script-runtime"))
     sideJars(commonDep("io.javaslang", "javaslang"))
     sideJars(commonDep("javax.inject"))
     sideJars(preloadedDeps("markdown", "kotlinx-coroutines-core", "kotlinx-coroutines-jdk8"))

prepare/mock-runtime-for-test/build.gradle.kts

@@ -7,7 +7,7 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-stdlib"))
 }
 
 sourceSets {
@@ -34,12 +34,8 @@ tasks.withType<JavaCompile> {
 
 val jar = runtimeJar {
     from(fileTree("${rootProject.extra["distDir"]}/builtins")) { include("kotlin/**") }
-    archiveName = "kotlin-mock-runtime-for-test.jar"
 }
 
-task<Copy>("dist") {
-    from(jar)
-    into(rootProject.extra["distDir"].toString())
-    rename("-${Regex.escape(rootProject.extra["build.number"].toString())}", "")
-}
+val distDir: String by rootProject.extra
 
+dist(targetName = "kotlin-mock-runtime-for-test.jar", targetDir = File(distDir))