azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: install -> npmInstall (collides with maven tasks)

Browse Source
This commit is contained in:
Anton Bannykh
2018-05-30 13:14:40 +03:00
parent b551afb202
commit 14dfb6bd99
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/build.gradle.kts
+3 -3
View File
@@ -74,9 +74,8 @@ projectTest("quickTest") {
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt") val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt")
val testDataDir = project(":js:js.translator").projectDir.resolve("testData") val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
val install by task<NpmTask> { val npmInstall by tasks.getting(NpmTask::class) {
setWorkingDir(testDataDir) setWorkingDir(testDataDir)
setArgs(listOf("install"))
} }
val runMocha by task<NpmTask> { val runMocha by task<NpmTask> {
@@ -85,7 +84,8 @@ val runMocha by task<NpmTask> {
val target = if (project.hasProperty("teamcity")) "runOnTeamcity" else "test" val target = if (project.hasProperty("teamcity")) "runOnTeamcity" else "test"
setArgs(listOf("run", target)) setArgs(listOf("run", target))
dependsOn(install, "test")
dependsOn(npmInstall, "test")
val check by tasks val check by tasks
check.dependsOn(this) check.dependsOn(this)