azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maven plugin: include source roots to compiler classpath (enabled mixed compilation)

Browse Source
This commit is contained in:
Leonid Shalupov
2012-04-11 21:32:28 +04:00
parent 45e86cb423
commit 1ecb2fe7db
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+6 -1
View File
@@ -164,6 +164,8 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
// don't include runtime, it should be in maven dependencies // don't include runtime, it should be in maven dependencies
arguments.mode = "stdlib"; arguments.mode = "stdlib";
final ArrayList<String> classpathList = new ArrayList<String>();
if (module != null) { if (module != null) {
log.info("Compiling Kotlin module " + module); log.info("Compiling Kotlin module " + module);
arguments.setModule(module); arguments.setModule(module);
@@ -174,9 +176,12 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
arguments.setSourceDirs(sources); arguments.setSourceDirs(sources);
log.info("Compiling Kotlin sources from " + arguments.getSourceDirs()); log.info("Compiling Kotlin sources from " + arguments.getSourceDirs());
// TODO: Move it compiler
classpathList.addAll(sources);
} }
final ArrayList<String> classpathList = new ArrayList<String>(classpath); classpathList.addAll(classpath);
if (classpathList.remove(output)) { if (classpathList.remove(output)) {
log.debug("Removed target directory from compiler classpath (" + output + ")"); log.debug("Removed target directory from compiler classpath (" + output + ")");