From 2dc4769c0a85afaa43d020206da89112440074f5 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 21 Dec 2017 08:57:36 +0100
Subject: [PATCH] Fixes after rebase

---
 build-common/build.gradle.kts            |  1 +
 js/js.tests/build.gradle.kts             | 14 --------------
 plugins/noarg/noarg-cli/build.gradle.kts |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts
index dec0d91e15a..db168dd2d83 100644
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":js:js.serializer"))
     compileOnly(project(":js:js.frontend"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "util") }
     compileOnly(project(":kotlin-reflect-api"))
 
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 6a00ffbdfe8..149daf4e2ea 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -42,7 +42,6 @@ dependencies {
     antLauncherJar(files(toolsJar()))
 }
 
-
 sourceSets {
     "main" {}
     "test" { projectDefault() }
@@ -78,19 +77,6 @@ projectTest("quickTest") {
     }
 }
 
-ant.importBuild(File(rootDir, "node_utils.xml"))
-
-val prepareNode: Task = tasks["download-nodejs-and-npm"]
-prepareNode.apply {
-    outputs.upToDateWhen { File(rootDir, "dependencies/node").exists() }
-}
-
-projectTest("nodeTest") {
-    workingDir = rootDir
-    dependsOn(prepareNode)
-    dependsOn("run-nodejs-tests")
-}
-
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt")
 val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
 
diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts
index ff27354e3ad..518d830dfc0 100644
--- a/plugins/noarg/noarg-cli/build.gradle.kts
+++ b/plugins/noarg/noarg-cli/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
 
-    testRuntime(ideaSdkDeps("*.jar"))
+    testRuntime(intellijDep())
 }
 
 sourceSets {