kotlin-test: rename shared module to common.
Do not use shared kotlin-test while building js stdlib.
This commit is contained in:
@@ -1086,7 +1086,7 @@
|
|||||||
<arg value="kotlin-test"/>
|
<arg value="kotlin-test"/>
|
||||||
<arg value="-Xallow-kotlin-package"/>
|
<arg value="-Xallow-kotlin-package"/>
|
||||||
<arg value="-Xmulti-platform"/>
|
<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"/>
|
<arg value="libraries/kotlin.test/jvm/src/main/kotlin"/>
|
||||||
</java>
|
</java>
|
||||||
|
|
||||||
@@ -1116,7 +1116,7 @@
|
|||||||
<arg line="-main noCall"/>
|
<arg line="-main noCall"/>
|
||||||
<arg line="-module-kind umd"/>
|
<arg line="-module-kind umd"/>
|
||||||
<arg value="-Xmulti-platform"/>
|
<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"/>
|
<arg value="libraries/kotlin.test/js/src/main/kotlin"/>
|
||||||
</java>
|
</java>
|
||||||
<pack-runtime-jar jar-name="kotlin-test-js.jar" implementation-title="${manifest.impl.title.kotlin.test}" runtime-component="TestJs">
|
<pack-runtime-jar jar-name="kotlin-test-js.jar" implementation-title="${manifest.impl.title.kotlin.test}" runtime-component="TestJs">
|
||||||
|
|||||||
@@ -30,10 +30,6 @@
|
|||||||
<include name="kotlin/Unit.kt"/>
|
<include name="kotlin/Unit.kt"/>
|
||||||
</fileset>
|
</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">
|
<fileset dir="${basedir}/${intermediate-sources}/stdlib/js">
|
||||||
<include name="**/*.kt" />
|
<include name="**/*.kt" />
|
||||||
</fileset>
|
</fileset>
|
||||||
|
|||||||
@@ -12,10 +12,10 @@
|
|||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>shared</module>
|
<module>common</module>
|
||||||
<module>junit</module>
|
|
||||||
<module>jvm</module>
|
<module>jvm</module>
|
||||||
<module>js</module>
|
<module>js</module>
|
||||||
|
<module>junit</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|||||||
Reference in New Issue
Block a user