diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index 241f1750ec1..a23ab6458e4 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -1,6 +1,4 @@ -@file:Suppress("unused") - -// usages in build scripts are not tracked properly +@file:Suppress("unused") // usages in build scripts are not tracked properly import org.gradle.api.GradleException import org.gradle.api.Project @@ -148,24 +146,3 @@ 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-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" -) diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index 19508002d25..9eb093aa719 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -34,7 +34,7 @@ sourceSets { } projectTest { - dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray()) + dependsOn(":dist") doFirst { environment("kotlin.tests.android.timeout", "45") } diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 50a8cf2453a..9d5c588b6ab 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -85,7 +85,7 @@ jar.from("../idea/resources") { } projectTest { - dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray()) + dependsOn(":dist") workingDir = rootDir systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator)) systemProperty("kotlin.suppress.expected.test.failures", project.findProperty("kotlin.suppress.expected.test.failures") ?: false) diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index e326954f9c1..7ec6b86dd27 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/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(":dist") workingDir = rootDir filter.includeTestsMatching("org.jetbrains.kotlin.codegen.jdk.JvmTarget${target}OnJvm${jvm}")