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

Pill: Ignore kotlin-scripting compiler plugin from compiler arguments

Browse Source
This commit is contained in:
Yan Zhulanow
2018-06-07 16:02:44 +03:00
parent fa56afca08
commit 83ec49db31
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/pill/parser.kt
+5 -1
View File
@@ -289,8 +289,12 @@ private fun getKotlinOptions(kotlinCompileTask: Any): PSourceRootKotlinOptions?
val addCompilerBuiltins = "Xadd-compiler-builtins" val addCompilerBuiltins = "Xadd-compiler-builtins"
val loadBuiltinsFromDependencies = "Xload-builtins-from-dependencies" val loadBuiltinsFromDependencies = "Xload-builtins-from-dependencies"
fun isOptionForScriptingCompilerPlugin(option: String)
= option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-gradle")
val extraArguments = compileArguments.filter { val extraArguments = compileArguments.filter {
it.startsWith("-X") && it != "-$addCompilerBuiltins" && it != "-$loadBuiltinsFromDependencies" it.startsWith("-X") && !isOptionForScriptingCompilerPlugin(it)
&& it != "-$addCompilerBuiltins" && it != "-$loadBuiltinsFromDependencies"
} }
return PSourceRootKotlinOptions( return PSourceRootKotlinOptions(