JS: use ANT replace task to set $version
Needed make kotlin-test depend on the same version of kotlin
(cherry picked from commit 4d12426145d4ffc664295c0841f0dc8c729c8a49)
diff --git a/js/npm.templates/kotlin-compiler/package.json b/js/npm.templates/kotlin-compiler/package.json
index 04612fa..6b96c40 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 65ad334..6e82524a 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 2fac326..0fc7f06 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 f7fd33a..14d9441 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"/>
