From 83ec49db31cbc56d1ab267c620f3e4db4132d703 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 7 Jun 2018 16:02:44 +0300 Subject: [PATCH] Pill: Ignore kotlin-scripting compiler plugin from compiler arguments --- buildSrc/src/main/kotlin/pill/parser.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/pill/parser.kt b/buildSrc/src/main/kotlin/pill/parser.kt index 70224f29c04..33f2e37c822 100644 --- a/buildSrc/src/main/kotlin/pill/parser.kt +++ b/buildSrc/src/main/kotlin/pill/parser.kt @@ -289,8 +289,12 @@ private fun getKotlinOptions(kotlinCompileTask: Any): PSourceRootKotlinOptions? val addCompilerBuiltins = "Xadd-compiler-builtins" val loadBuiltinsFromDependencies = "Xload-builtins-from-dependencies" + fun isOptionForScriptingCompilerPlugin(option: String) + = option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-gradle") + val extraArguments = compileArguments.filter { - it.startsWith("-X") && it != "-$addCompilerBuiltins" && it != "-$loadBuiltinsFromDependencies" + it.startsWith("-X") && !isOptionForScriptingCompilerPlugin(it) + && it != "-$addCompilerBuiltins" && it != "-$loadBuiltinsFromDependencies" } return PSourceRootKotlinOptions(