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

Don't overwrite plugin classpaths detected earlier for annotation processing. Fixes #KT-18022

Browse Source
This commit is contained in:
Bill Collins
2017-05-24 10:00:09 +03:00
committed by Yan Zhulanow
parent 3770786075
commit 9a40e9b96d
1 changed files with 11 additions and 3 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
+11 -3
View File
@@ -466,10 +466,18 @@ public abstract class KotlinCompileMojoBase<A extends CommonCompilerArguments> e
List<String> pluginClassPaths = getCompilerPluginClassPaths(); List<String> pluginClassPaths = getCompilerPluginClassPaths();
if (pluginClassPaths != null && !pluginClassPaths.isEmpty()) { if (pluginClassPaths != null && !pluginClassPaths.isEmpty()) {
if (getLog().isDebugEnabled()) { if (arguments.pluginClasspaths == null || arguments.pluginClasspaths.length == 0) {
getLog().debug("Plugin classpaths are: " + Joiner.on(", ").join(pluginClassPaths)); arguments.pluginClasspaths = pluginClassPaths.toArray(new String[pluginClassPaths.size()]);
} else {
for (String path : pluginClassPaths) {
arguments.pluginClasspaths = ArrayUtil.append(arguments.pluginClasspaths, path);
}
} }
arguments.pluginClasspaths = pluginClassPaths.toArray(new String[pluginClassPaths.size()]);
if (getLog().isDebugEnabled()) {
getLog().debug("Plugin classpaths are: " + Joiner.on(", ").join(arguments.pluginClasspaths));
}
} }
List<String> pluginArguments; List<String> pluginArguments;