From 14dfb6bd99354d36649fa5f262a386901be67a06 Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Wed, 30 May 2018 13:14:40 +0300 Subject: [PATCH] JS: install -> npmInstall (collides with maven tasks) --- js/js.tests/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index d19b0dd55c2..c41b805e8a1 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -74,9 +74,8 @@ projectTest("quickTest") { val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt") val testDataDir = project(":js:js.translator").projectDir.resolve("testData") -val install by task { +val npmInstall by tasks.getting(NpmTask::class) { setWorkingDir(testDataDir) - setArgs(listOf("install")) } val runMocha by task { @@ -85,7 +84,8 @@ val runMocha by task { val target = if (project.hasProperty("teamcity")) "runOnTeamcity" else "test" setArgs(listOf("run", target)) - dependsOn(install, "test") + + dependsOn(npmInstall, "test") val check by tasks check.dependsOn(this)