kotlin-test: rename shared module to common.

Do not use shared kotlin-test while building js stdlib.
This commit is contained in:
Ilya Gorbunov
2017-01-24 01:23:46 +03:00
parent 5ef27f7ad3
commit 9b9852cdc9
18 changed files with 4 additions and 8 deletions
+2 -2
View File
@@ -1086,7 +1086,7 @@
<arg value="kotlin-test"/>
<arg value="-Xallow-kotlin-package"/>
<arg value="-Xmulti-platform"/>
<arg value="libraries/kotlin.test/shared/src/main/kotlin"/>
<arg value="libraries/kotlin.test/common/src/main/kotlin"/>
<arg value="libraries/kotlin.test/jvm/src/main/kotlin"/>
</java>
@@ -1116,7 +1116,7 @@
<arg line="-main noCall"/>
<arg line="-module-kind umd"/>
<arg value="-Xmulti-platform"/>
<arg value="libraries/kotlin.test/shared/src/main/kotlin"/>
<arg value="libraries/kotlin.test/common/src/main/kotlin"/>
<arg value="libraries/kotlin.test/js/src/main/kotlin"/>
</java>
<pack-runtime-jar jar-name="kotlin-test-js.jar" implementation-title="${manifest.impl.title.kotlin.test}" runtime-component="TestJs">
-4
View File
@@ -30,10 +30,6 @@
<include name="kotlin/Unit.kt"/>
</fileset>
<fileset dir="${basedir}/libraries/kotlin.test/shared">
<include name="src/main/kotlin/kotlin/test/TestAssertions.kt" />
</fileset>
<fileset dir="${basedir}/${intermediate-sources}/stdlib/js">
<include name="**/*.kt" />
</fileset>
+2 -2
View File
@@ -12,10 +12,10 @@
<packaging>pom</packaging>
<modules>
<module>shared</module>
<module>junit</module>
<module>common</module>
<module>jvm</module>
<module>js</module>
<module>junit</module>
</modules>
<properties>