From a4722a4000bbd1bb575b5127e92d46f45c034852 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 2 Oct 2017 23:05:13 +0300 Subject: [PATCH] Make "js.tests" depends on ":kotlin-test:kotlin-test-js" since it's used on runtime inside JS tests. Transform dependency on ":kotlin-stdlib-js" to testRuntime since it's required only on runtime. And remove unnecessary dependency from jsCompilerTest. --- build.gradle.kts | 1 - js/js.tests/build.gradle.kts | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 78c3af322bd..4a557b393ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -339,7 +339,6 @@ tasks { } "jsCompilerTest" { - dependsOn("dist") dependsOn(":js:js.tests:test") } diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 41d511ac476..818e372f0d9 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -11,10 +11,11 @@ dependencies { testCompile(project(":js:js.dce")) testCompile(ideaSdkDeps("openapi", "idea")) testRuntime(commonDep("junit:junit")) - testRuntime(projectDist(":kotlin-test:kotlin-test-jvm")) - testRuntime(projectDist(":kotlin-test:kotlin-test-junit")) testRuntime(projectDist(":kotlin-stdlib")) + testRuntime(projectDist(":kotlin-stdlib-js")) + testRuntime(projectDist(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned testRuntime(projectDist(":kotlin-reflect")) + testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests testRuntime(project(":compiler:backend-common")) // testRuntime(ideaSdkDeps("*.jar")) testRuntime(commonDep("org.fusesource.jansi", "jansi")) @@ -31,9 +32,6 @@ val testDistProjects = listOf( ":kotlin-compiler", ":kotlin-script-runtime", ":kotlin-stdlib", - ":kotlin-stdlib-js", - ":kotlin-test:kotlin-test-jvm", - ":kotlin-test:kotlin-test-junit", ":kotlin-daemon-client", ":kotlin-ant")