From c084dfa1d71120ecd4a25fd19db2a2e8f091a06d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 28 Dec 2019 04:24:04 +0300 Subject: [PATCH] [JS IR] stdlib: use 'base' plugin instead of kotlin("jvm") 'base' plugin is enough in this case, given that a couple of tasks is registered and configured manually. Fix kotlin-reflect dependency to be a project dependency. --- libraries/stdlib/js-ir/build.gradle.kts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index fbbec7cb60f..f5c6bdfbe49 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -2,7 +2,7 @@ import com.moowork.gradle.node.npm.NpmTask import com.moowork.gradle.node.task.NodeTask plugins { - kotlin("jvm") + base id("com.github.node-gradle.node") } @@ -29,7 +29,7 @@ dependencies { fullJsIrCli(project(":js:js.translator")) fullJsIrCli(project(":js:js.serializer")) fullJsIrCli(project(":js:js.dce")) - fullJsIrCli(kotlin("reflect")) + fullJsIrCli(project(":kotlin-reflect")) fullJsIrCli(intellijCoreDep()) { includeJars("intellij-core") } fullJsIrCli(intellijDep()) { includeJars("picocontainer", "trove4j", "guava", "jdom", "asm-all", rootProject = rootProject) @@ -337,9 +337,8 @@ val runMocha by task { } tasks { - test { - dependsOn(runMocha) - } + val test by registering { dependsOn(runMocha) } + val check by existing { dependsOn(test) } // dummy task to make coreLibsInstall aggregate task not fail val install by registering