[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.
This commit is contained in:
Ilya Gorbunov
2019-12-28 04:24:04 +03:00
parent a9fec21178
commit c084dfa1d7
+4 -5
View File
@@ -2,7 +2,7 @@ import com.moowork.gradle.node.npm.NpmTask
import com.moowork.gradle.node.task.NodeTask import com.moowork.gradle.node.task.NodeTask
plugins { plugins {
kotlin("jvm") base
id("com.github.node-gradle.node") id("com.github.node-gradle.node")
} }
@@ -29,7 +29,7 @@ dependencies {
fullJsIrCli(project(":js:js.translator")) fullJsIrCli(project(":js:js.translator"))
fullJsIrCli(project(":js:js.serializer")) fullJsIrCli(project(":js:js.serializer"))
fullJsIrCli(project(":js:js.dce")) fullJsIrCli(project(":js:js.dce"))
fullJsIrCli(kotlin("reflect")) fullJsIrCli(project(":kotlin-reflect"))
fullJsIrCli(intellijCoreDep()) { includeJars("intellij-core") } fullJsIrCli(intellijCoreDep()) { includeJars("intellij-core") }
fullJsIrCli(intellijDep()) { fullJsIrCli(intellijDep()) {
includeJars("picocontainer", "trove4j", "guava", "jdom", "asm-all", rootProject = rootProject) includeJars("picocontainer", "trove4j", "guava", "jdom", "asm-all", rootProject = rootProject)
@@ -337,9 +337,8 @@ val runMocha by task<NodeTask> {
} }
tasks { tasks {
test { val test by registering { dependsOn(runMocha) }
dependsOn(runMocha) val check by existing { dependsOn(test) }
}
// dummy task to make coreLibsInstall aggregate task not fail // dummy task to make coreLibsInstall aggregate task not fail
val install by registering val install by registering