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

Fixed code outside main project which was broken after refactoring.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-07-07 20:31:43 +04:00
parent 03f4ef4a09
commit 8050b96f27
5 changed files with 24 additions and 16 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
+4 -3
View File
@@ -165,7 +165,7 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
protected void configureBaseCompilerArguments(Log log, K2JVMCompilerArguments arguments, String module,
List<String> sources, List<String> classpath, String output) throws MojoExecutionException {
// don't include runtime, it should be in maven dependencies
arguments.mode = "stdlib";
arguments.noStdlib = true;
final ArrayList<String> classpathList = new ArrayList<String>();
@@ -205,8 +205,9 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
log.info("Classes directory is " + output);
arguments.setOutputDir(output);
arguments.jdkAnnotations = getJdkAnnotations().getPath();
log.debug("Using jdk annotations from " + arguments.jdkAnnotations);
arguments.noJdkAnnotations = true;
arguments.annotations = getJdkAnnotations().getPath();
log.debug("Using jdk annotations from " + arguments.annotations);
}
// TODO: Make a better runtime detection or get rid of it entirely