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

Allopen, Noarg: Implement old classpath elements filtering correctly (KT-15448)

Browse Source
This commit is contained in:
Yan Zhulanow
2016-12-29 22:06:32 +03:00
committed by Yan Zhulanow
parent f1b7d30363
commit 85450955b6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-based-compiler-plugins-ide-support/src/idePluginUtils.kt
+1 -1
View File
@@ -40,7 +40,7 @@ internal fun modifyCompilerArgumentsForPlugin(
val newPluginOptions = oldPluginOptions + annotationOptions val newPluginOptions = oldPluginOptions + annotationOptions
val oldPluginClasspaths = (commonArguments.pluginClasspaths ?: emptyArray()).filterTo(mutableListOf()) { val oldPluginClasspaths = (commonArguments.pluginClasspaths ?: emptyArray()).filterTo(mutableListOf()) {
!it.substringAfterLast('/', missingDelimiterValue = "").matches("(kotlin-)?$pluginName-.*\\.jar".toRegex()) !it.substringAfterLast('/', missingDelimiterValue = "").matches("(kotlin-)?(maven-)?$pluginName-.*\\.jar".toRegex())
} }
val newPluginClasspaths = oldPluginClasspaths + (setup?.classpath ?: emptyList()) val newPluginClasspaths = oldPluginClasspaths + (setup?.classpath ?: emptyList())