From d92cce6e6a62d2c1507928f447d01aae9d5297ab Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 11 Sep 2017 22:34:01 +0200
Subject: [PATCH] Fix build after rebase on master

---
 buildSrc/src/main/kotlin/dependencies.kt | 6 ++++++
 generators/build.gradle.kts              | 1 -
 idea/idea-gradle/build.gradle.kts        | 2 +-
 plugins/uast-kotlin/build.gradle.kts     | 1 -
 ultimate/build.gradle.kts                | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index 9a231f5d70f..1814bba6fd4 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -38,6 +38,12 @@ fun Project.preloadedDeps(vararg artifactBaseNames: String, baseDir: File = File
     return files(*matchingFiles.map { it.canonicalPath }.toTypedArray())
 }
 
+fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir: String? = null): ConfigurableFileCollection {
+    val ultimateDepsDir = File(rootDir, "ultimate", "dependencies")
+    return if (ultimateDepsDir.isDirectory) preloadedDeps(*artifactBaseNames, baseDir = ultimateDepsDir, subdir = subdir)
+    else files()
+}
+
 fun Project.ideaSdkDeps(vararg artifactBaseNames: String, subdir: String = "lib"): ConfigurableFileCollection =
         preloadedDeps(*artifactBaseNames, baseDir = File(rootDir, "ideaSDK"), subdir = subdir)
 
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index 1644a76e7c4..036201fcbc0 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(commonDep("junit:junit"))
     testCompile(ideaSdkDeps("openapi", "idea"))
-    testCompile(preloadedDeps("uast-tests"))
     testRuntime(ideaSdkDeps("*.jar"))
     testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
     testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index b91c38f074c..958952c0c04 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -2,7 +2,7 @@ apply { plugin("kotlin") }
 
 dependencies {
 
-    compileOnly(ideaSdkDeps("openapi", "idea"))
+    compileOnly(ideaSdkDeps("openapi", "idea", "external-system-rt"))
     compileOnly(ideaPluginDeps("gradle-tooling-api", "gradle", plugin = "gradle"))
     compileOnly(ideaPluginDeps("Groovy", plugin = "Groovy"))
 
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index 21f1701be12..e5b43a2d86a 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":idea:idea-android"))
-    testCompile(preloadedDeps("uast-tests"))
     testRuntime(ideaSdkDeps("*.jar"))
 }
 
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index 4143e02c537..0139674c1fd 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     compile(project(":idea:ide-common")) { isTransitive = false }
     compile(project(":idea:idea-gradle")) { isTransitive = false }
 
+    compile(ideaUltimatePreloadedDeps("*.jar", subdir = "nodejs_plugin/NodeJS/lib"))
     compile(ideaUltimateSdkCoreDeps("annotations", "trove4j", "intellij-core"))
     compile(ideaUltimateSdkDeps("openapi", "idea", "util"))
 //    compile(ideaUltimatePluginDeps("gradle-tooling-api", plugin = "gradle"))