Explicitly specify test dist dependencies

buildSrc/src/main/kotlin/dependencies.kt

@@ -123,4 +123,27 @@ fun AbstractCopyTask.fromEmbeddedComponents() {
             }
         }
     }
-}
+}
+
+// TODO: it seems incomplete, find and add missing dependencies
+val testDistProjects = listOf(
+    "", // for root project
+    ":kotlin-stdlib:jvm-minimal-for-test",
+    ":kotlin-compiler",
+    ":kotlin-script-runtime",
+    ":kotlin-stdlib",
+    ":kotlin-stdlib-jre7",
+    ":kotlin-stdlib-jre8",
+    ":kotlin-stdlib-jdk7",
+    ":kotlin-stdlib-jdk8",
+    ":kotlin-stdlib-js",
+    ":kotlin-reflect",
+    ":kotlin-test:kotlin-test-jvm",
+    ":kotlin-test:kotlin-test-junit",
+    ":kotlin-test:kotlin-test-js",
+    ":kotlin-preloader",
+    ":plugins:android-extensions-compiler",
+    ":kotlin-ant",
+    ":kotlin-annotations-jvm",
+    ":kotlin-annotations-android"
+)

compiler/android-tests/build.gradle.kts

@@ -34,6 +34,7 @@ sourceSets {
 }
 
 projectTest {
+    dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
     doFirst {
         environment("kotlin.tests.android.timeout", "45")
     }

compiler/build.gradle.kts

@@ -36,30 +36,6 @@ val depDistProjects = listOf(
         ":kotlin-stdlib",
         ":kotlin-test:kotlin-test-jvm"
 )
-
-// TODO: it seems incomplete, find and add missing dependencies
-val testDistProjects = listOf(
-        "", // for root project
-        ":kotlin-stdlib:jvm-minimal-for-test",
-        ":kotlin-compiler",
-        ":kotlin-script-runtime",
-        ":kotlin-stdlib",
-        ":kotlin-stdlib-jre7",
-        ":kotlin-stdlib-jre8",
-        ":kotlin-stdlib-jdk7",
-        ":kotlin-stdlib-jdk8",
-        ":kotlin-stdlib-js",
-        ":kotlin-reflect",
-        ":kotlin-test:kotlin-test-jvm",
-        ":kotlin-test:kotlin-test-junit",
-        ":kotlin-test:kotlin-test-js",
-        ":kotlin-preloader",
-        ":plugins:android-extensions-compiler",
-        ":kotlin-ant",
-        ":kotlin-annotations-jvm",
-        ":kotlin-annotations-android"
-)
-
 val antLauncherJar by configurations.creating
 
 dependencies {

compiler/tests-different-jdk/build.gradle.kts

@@ -25,7 +25,7 @@ sourceSets {
 fun Project.codegenTest(target: Int, jvm: Int,
                         jdk: String = "JDK_${if (jvm <= 8) "1" else ""}$jvm",
                         body: Test.() -> Unit): Test = projectTest("codegenTarget${target}Jvm${jvm}Test") {
-    //dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
+    dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
     workingDir = rootDir
 
     filter.includeTestsMatching("org.jetbrains.kotlin.codegen.jdk.JvmTarget${target}OnJvm${jvm}")