Fix tests in the new build infrastructure

Author: ligee

ant/build.gradle.kts

@@ -6,7 +6,7 @@ apply { plugin("kotlin") }
 dependencies {
     compile(commonDep("org.apache.ant", "ant"))
     compile(project(":kotlin-preloader"))
-    compile(project(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-stdlib"))
 }
 
 sourceSets {

build-common/build.gradle.kts

@@ -13,8 +13,8 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(project(":compiler.tests-common"))
     testCompile(protobufFull())
-    testRuntime(project(":kotlin-stdlib"))
-    testRuntime(project(":kotlin-reflect"))
+    testRuntime(projectDist(":kotlin-stdlib"))
+    testRuntime(projectDist(":kotlin-reflect"))
 }
 
 sourceSets {

buildSrc/src/main/kotlin/CommonUtil.kt

@@ -13,7 +13,10 @@ inline fun <reified T : Task> Project.task(noinline configuration: T.() -> Unit)
 
 
 fun AbstractTask.dependsOnTaskIfExists(task: String) {
-    project.tasks.firstOrNull { it.name == task }?.let { dependsOn(it) }
+    val thisTask = this
+    project.afterEvaluate {
+        project.tasks.firstOrNull { it.name == task }?.let { thisTask.dependsOn(it) }
+    }
 }
 
 fun AbstractTask.dependsOnTaskIfExistsRec(task: String, project: Project? = null) {

buildSrc/src/main/kotlin/artifacts.kt

@@ -8,10 +8,11 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.plugins.BasePluginConvention
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.jvm.tasks.Jar
-
+import java.io.File
 
 fun Project.testsJar(body: Jar.() -> Unit = {}): Jar {
     val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testCompile"])
@@ -93,7 +94,7 @@ fun Project.publish(body: Upload.() -> Unit = {}): Upload {
     }
 }
 
-fun Project.ideaPlugin(subdir: String = "lib", body: Copy.() -> Unit) {
+fun Project.ideaPlugin(subdir: String = "lib", body: AbstractCopyTask.() -> Unit) {
     task<Copy>("idea-plugin") {
         body()
         into(File(rootProject.extra["ideaPluginDir"].toString(), subdir).path)
@@ -105,19 +106,27 @@ fun Project.ideaPlugin(subdir: String = "lib") = ideaPlugin(subdir) {
     fromRuntimeJarIfExists(this)
 }
 
+fun Project.dist(targetDir: File? = null,
+                 targetName: String? = null,
+                 fromTask: Task? = null,
+                 body: AbstractCopyTask.() -> Unit = {}): AbstractCopyTask {
+    val distJarCfg = configurations.getOrCreate("distJar")
+    val distLibDir: File by rootProject.extra
+    val distJarName = targetName ?: (the<BasePluginConvention>().archivesBaseName + ".jar")
 
-fun Project.dist(body: Copy.() -> Unit) {
-    task<Copy>("dist") {
+    return task<Copy>("dist") {
         body()
-        rename("-${java.util.regex.Pattern.quote(rootProject.extra["build.number"].toString())}", "")
-        into(rootProject.extra["distLibDir"].toString())
+        when {
+            fromTask != null -> from(fromTask)
+            else -> project.fromRuntimeJarIfExists(this)
+        }
+        rename(".*", distJarName)
+//        rename("-${java.util.regex.Pattern.quote(rootProject.extra["build.number"].toString())}", "")
+        into(targetDir ?: distLibDir)
+        project.addArtifact(distJarCfg, this, File(targetDir ?: distLibDir, distJarName))
     }
 }
 
-fun Project.dist() = dist {
-    fromRuntimeJarIfExists(this)
-}
-
 private fun<T: AbstractCopyTask> Project.fromRuntimeJarIfExists(task: T) {
     if (extra.has("runtimeJarTask")) {
         task.from(extra["runtimeJarTask"] as Task)

buildSrc/src/main/kotlin/dependencies.kt

@@ -51,6 +51,7 @@ fun DependencyHandler.projectDep(name: String): Dependency = project(name, confi
 fun DependencyHandler.projectDepIntransitive(name: String): Dependency =
         project(name, configuration = "default").apply { isTransitive = false }
 
+fun DependencyHandler.projectDist(name: String): Dependency = project(name, configuration = "distJar").apply { isTransitive = false }
 fun DependencyHandler.projectTests(name: String): Dependency = project(name, configuration = "tests-jar").apply { isTransitive = false }
 fun DependencyHandler.projectRuntimeJar(name: String): Dependency = project(name, configuration = "runtimeJar")
 fun DependencyHandler.projectArchives(name: String): Dependency = project(name, configuration = "archives")

compiler.tests-common/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     compile(project(":js:js.translator"))
     compile(project(":android-extensions-compiler"))
     compile(project(":kotlin-test:kotlin-test-jvm"))
-    compile(commonDep("junit"))
+    compile(commonDep("junit:junit"))
     compile(ideaSdkCoreDeps("intellij-core"))
     compile(ideaSdkDeps("openapi", "idea", "idea_rt"))
     compile(preloadedDeps("dx", subdir = "android-5.0/lib"))

compiler/build.gradle.kts

@@ -9,34 +9,55 @@ jvmTarget = "1.6"
 val compilerModules: Array<String> by rootProject.extra
 val otherCompilerModules = compilerModules.filter { it != path }
 
+val depDistProjects = listOf(
+        ":kotlin-script-runtime",
+        ":kotlin-stdlib",
+        ":kotlin-reflect",
+        ":kotlin-test:kotlin-test-jvm")
+
+// TODO: it seems incomplete, find and add missing dependencies
+val testDistProjects = listOf(
+        "", // for root project
+        ":prepare:mock-runtime-for-test",
+        ":kotlin-compiler",
+        ":kotlin-runtime",
+        ":kotlin-script-runtime",
+        ":kotlin-stdlib",
+        ":kotlin-stdlib-jre7",
+        ":kotlin-stdlib-jre8",
+        ":kotlin-stdlib-js",
+        ":kotlin-reflect",
+        ":kotlin-test:kotlin-test-jvm",
+        ":kotlin-test:kotlin-test-junit",
+        ":kotlin-test:kotlin-test-js",
+        ":kotlin-daemon-client",
+        ":android-extensions-compiler",
+        ":kotlin-ant")
+
 dependencies {
+    depDistProjects.forEach {
+        testCompile(projectDist(it))
+    }
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompileOnly(projectDist(":kotlin-test:kotlin-test-jvm"))
+    testCompileOnly(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(project(":compiler.tests-common"))
-    testCompileOnly(project(":compiler:ir.ir2cfg"))
-    testCompileOnly(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
-    testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
-    // deps below are test runtime deps, but made test compile to split compilation and running to reduce mem req
-    testCompile(project(":kotlin-stdlib"))
-    testCompile(project(":kotlin-script-runtime"))
-    testCompile(project(":kotlin-runtime"))
-    testCompile(project(":kotlin-reflect"))
-    testCompile(project(":android-extensions-compiler"))
-    testCompile(project(":kotlin-ant"))
+    testCompile(project(":compiler:ir.ir2cfg"))
+    testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
     otherCompilerModules.forEach {
-        testCompile(project(it))
+        testCompileOnly(project(it))
     }
+    testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
     testRuntime(ideaSdkCoreDeps("*.jar"))
     testRuntime(ideaSdkDeps("*.jar"))
-//    testRuntime(project(":kotlin-compiler", configuration = "default"))
 }
 
 sourceSets {
     "main" {}
     "test" {
         projectDefault()
-        java.srcDir("tests-ir-jvm/tests")
+        // not yet ready
+//        java.srcDir("tests-ir-jvm/tests")
     }
 }
 
@@ -52,22 +73,6 @@ jar.apply {
 
 testsJar {}
 
-// TODO: it seems incomlete, find and add missing dependencies
-val testDistProjects = listOf(
-       ":prepare:mock-runtime-for-test",
-       ":kotlin-compiler",
-       ":kotlin-runtime",
-       ":kotlin-script-runtime",
-       ":kotlin-stdlib",
-       ":kotlin-stdlib-jre7",
-       ":kotlin-stdlib-jre8",
-       ":kotlin-stdlib-js",
-       ":kotlin-reflect",
-       ":kotlin-test:kotlin-test-jvm",
-       ":kotlin-test:kotlin-test-junit",
-       ":kotlin-test:kotlin-test-js",
-       ":kotlin-daemon-client")
-
 projectTest {
     dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
     workingDir = rootDir

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

@@ -6,7 +6,7 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-stdlib"))
 }
 
 sourceSets {

compiler/container/build.gradle.kts

@@ -7,8 +7,9 @@ dependencies {
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))
     compile(ideaSdkCoreDeps("intellij-core"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testRuntime(ideaSdkCoreDeps("trove4j", "intellij-core"))
 }
 

compiler/frontend.script/build.gradle.kts

@@ -6,7 +6,7 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
-    compile(project(":kotlin-reflect"))
+    compile(projectDist(":kotlin-reflect"))
     compile(preloadedDeps("kotlinx-coroutines-core"))
 }