From 3e0d83b7d1e748a5d3acfed16a2891da4e9a9032 Mon Sep 17 00:00:00 2001
From: Anton Bannykh <Anton.Bannykh@jetbrains.com>
Date: Thu, 21 Dec 2017 15:22:07 +0300
Subject: [PATCH] Make :js:npm a separate project to avoid calling
 update_dependencies

---
 gradle/project-schema.json        | 14 --------------
 js/npm/build.gradle.kts           |  2 +-
 js/npm/gradle/project-schema.json | 16 ++++++++++++++++
 js/npm/settings.gradle            |  0
 settings.gradle                   |  1 -
 5 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 js/npm/gradle/project-schema.json
 create mode 100644 js/npm/settings.gradle

diff --git a/gradle/project-schema.json b/gradle/project-schema.json
index 10d1f5609e4..8c57b991b4e 100644
--- a/gradle/project-schema.json
+++ b/gradle/project-schema.json
@@ -4005,20 +4005,6 @@
             "reporting": "org.gradle.api.reporting.ReportingExtension"
         }
     },
-    ":js:npm": {
-        "conventions": {
-            "base": "org.gradle.api.plugins.BasePluginConvention"
-        },
-        "configurations": [
-            "archives",
-            "default"
-        ],
-        "extensions": {
-            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
-            "node": "com.moowork.gradle.node.NodeExtension",
-            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet"
-        }
-    },
     ":kotlin-allopen:plugin-marker": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
diff --git a/js/npm/build.gradle.kts b/js/npm/build.gradle.kts
index ebec1de1924..88c790baee4 100644
--- a/js/npm/build.gradle.kts
+++ b/js/npm/build.gradle.kts
@@ -13,7 +13,7 @@ node {
 
 val deployDir = "$buildDir/deploy_to_npm"
 val templateDir = "$projectDir/templates"
-val kotlincDir = rootProject.extra["distKotlinHomeDir"] as String
+val kotlincDir = "$projectDir/../../dist/kotlinc"
 
 fun getProperty(name: String, default: String = "") = findProperty(name)?.toString() ?: default
 
diff --git a/js/npm/gradle/project-schema.json b/js/npm/gradle/project-schema.json
new file mode 100644
index 00000000000..8b1dc0acbc0
--- /dev/null
+++ b/js/npm/gradle/project-schema.json
@@ -0,0 +1,16 @@
+{
+    ":": {
+        "conventions": {
+            "base": "org.gradle.api.plugins.BasePluginConvention"
+        },
+        "configurations": [
+            "archives",
+            "default"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "node": "com.moowork.gradle.node.NodeExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet"
+        }
+    }
+}
\ No newline at end of file
diff --git a/js/npm/settings.gradle b/js/npm/settings.gradle
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/settings.gradle b/settings.gradle
index 9ae802b4b06..780e978f2ab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -47,7 +47,6 @@ include ":kotlin-build-common",
         ":js:js.translator",
         ":js:js.dce",
         ":js:js.tests",
-        ":js:npm",
         ":jps-plugin",
         ":kotlin-jps-plugin",
         ":core:descriptors",