From 4d12426145d4ffc664295c0841f0dc8c729c8a49 Mon Sep 17 00:00:00 2001
From: Anton Bannykh <Anton.Bannykh@jetbrains.com>
Date: Thu, 9 Nov 2017 14:56:47 +0300
Subject: [PATCH] JS: use ANT replace task to set $version

Needed make kotlin-test depend on the same version of kotlin
---
 js/npm.templates/kotlin-compiler/package.json | 2 +-
 js/npm.templates/kotlin-test/package.json     | 7 +++++--
 js/npm.templates/kotlin/package.json          | 2 +-
 node_utils.xml                                | 5 ++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/js/npm.templates/kotlin-compiler/package.json b/js/npm.templates/kotlin-compiler/package.json
index 04612fab7ab..6b96c40bae6 100644
--- a/js/npm.templates/kotlin-compiler/package.json
+++ b/js/npm.templates/kotlin-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kotlin-compiler",
-  "version": "0.0.0",
+  "version": "$version",
   "description": "Kotlin compiler",
   "repository": {
     "type": "git",
diff --git a/js/npm.templates/kotlin-test/package.json b/js/npm.templates/kotlin-test/package.json
index 65ad334a0de..6e82524a823 100644
--- a/js/npm.templates/kotlin-test/package.json
+++ b/js/npm.templates/kotlin-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kotlin-test",
-  "version": "1.0.0",
+  "version": "$version",
   "description": "Standard Testing Library for Kotlin Applications",
   "main": "kotlin-test.js",
   "repository": {
@@ -19,5 +19,8 @@
   "bugs": {
     "url": "kotl.in/issue"
   },
-  "homepage": "kotlinlang.org"
+  "homepage": "kotlinlang.org",
+  "dependencies": {
+    "kotlin": "$version"
+  }
 }
diff --git a/js/npm.templates/kotlin/package.json b/js/npm.templates/kotlin/package.json
index 2fac326ba12..0fc7f0602d8 100644
--- a/js/npm.templates/kotlin/package.json
+++ b/js/npm.templates/kotlin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kotlin",
-  "version": "1.0.0",
+  "version": "$version",
   "description": "Standard Library for Kotlin Applications",
   "main": "kotlin.js",
   "repository": {
diff --git a/node_utils.xml b/node_utils.xml
index 973aeae3c81..cbb63e409d6 100644
--- a/node_utils.xml
+++ b/node_utils.xml
@@ -97,9 +97,8 @@
 
             <actions/>
 
-            <npm command="version" dir="${package_deploy_dir}">
-                <arg value="@{version}"/>
-            </npm>
+            <replace file="${package_deploy_dir}/package.json" token="$version" value="@{version}" />
+
             <npm command="publish" dir="${package_deploy_dir}">
                 <arg value="--//registry.npmjs.org/:_authToken=${kotlin.npmjs.auth.token}"/>
                 <arg value="--tag"/>