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

maven plugin: exclude kotlin-runtime jar from classpath passed to compiler

Browse Source
This commit is contained in:
Leonid Shalupov
2012-04-10 22:38:31 +04:00
parent 863042da27
commit 1a63f91cc5
1 changed files with 22 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
+22 -1
View File
@@ -180,7 +180,13 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
final ArrayList<String> classpathList = new ArrayList<String>(classpath);
if (classpathList.remove(output)) {
log.debug("Removed target directory from classpath (" + output + ")");
log.debug("Removed target directory from compiler classpath (" + output + ")");
}
final String runtime = getRuntimeFromClassPath(classpath);
if (runtime != null) {
log.debug("Removed Kotlin runtime from compiler classpath (" + runtime + ")");
classpathList.remove(runtime);
}
final String classPathString = Joiner.on(File.pathSeparator).join(classpathList);
@@ -194,6 +200,21 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
log.debug("Using jdk headers from " + arguments.jdkHeaders);
}
// TODO: Make a better runtime detection or get rid of it entirely
private String getRuntimeFromClassPath(List<String> classpath) {
for (String item : classpath) {
final int lastSeparatorIndex = item.lastIndexOf(File.separator);
if (lastSeparatorIndex < 0)
continue;
if (item.startsWith("kotlin-runtime-", lastSeparatorIndex + 1) && item.endsWith(".jar"))
return item;
}
return null;
}
private File jdkHeadersPath;
protected File getJdkHeaders() {