got the mvn k2js plugin working again & re-enabled the js building in the mvn build (apart from running the junit JS tests as some of them fail)
This commit is contained in:
@@ -52,13 +52,7 @@
|
||||
<module>tools/runtime</module>
|
||||
<module>tools/kotlin-maven-plugin</module>
|
||||
<module>tools/kotlin-js-library</module>
|
||||
<!--
|
||||
TODO: temporary fix until this bug fixed:
|
||||
java.lang.IllegalStateException: null at (5,10) in /stdlib/JUMaps.kt.jet
|
||||
|
||||
<module>tools/kotlin-js-tests</module>
|
||||
-->
|
||||
|
||||
<!--
|
||||
TODO temporary disabled until KT-2314 fixed
|
||||
|
||||
@@ -77,14 +71,8 @@
|
||||
<module>docs/website</module>
|
||||
|
||||
<module>examples/kotlin-java-example</module>
|
||||
|
||||
<!--
|
||||
TODO: temporary fix until this bug fixed:
|
||||
java.lang.IllegalStateException: null at (5,10) in /stdlib/JUMaps.kt.jet
|
||||
|
||||
<module>examples/js-example</module>
|
||||
<module>examples/browser-example</module>
|
||||
-->
|
||||
</modules>
|
||||
|
||||
<dependencies>
|
||||
|
||||
+2
-1
@@ -29,6 +29,7 @@ import org.jetbrains.k2js.config.MetaInfServices;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* Converts Kotlin to JavaScript code
|
||||
@@ -165,8 +166,8 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
|
||||
if (sources.size() > 0) {
|
||||
k2jsArgs.sourceFiles = sources.toArray(new String[sources.size()]);
|
||||
}
|
||||
getLog().info("Compiling Kotlin src from " + Arrays.asList(k2jsArgs.sourceFiles) + " to JavaScript at: " + outputFile);
|
||||
}
|
||||
getLog().info("Compiling Kotlin src from " + arguments.getSrc() + " to JavaScript at: " + outputFile);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user