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

Pill: fix name of ignored kotlin-scripting compiler plugin

Browse Source
This commit is contained in:
Zalim Bashorov
2018-07-10 00:00:29 +03:00
parent a58acdd537
commit 35b2b762cd
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/pill/parser.kt
+6 -1
View File
@@ -1,3 +1,8 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("PackageDirectoryMismatch") @file:Suppress("PackageDirectoryMismatch")
package org.jetbrains.kotlin.pill package org.jetbrains.kotlin.pill
@@ -290,7 +295,7 @@ private fun getKotlinOptions(kotlinCompileTask: Any): PSourceRootKotlinOptions?
val loadBuiltinsFromDependencies = "Xload-builtins-from-dependencies" val loadBuiltinsFromDependencies = "Xload-builtins-from-dependencies"
fun isOptionForScriptingCompilerPlugin(option: String) fun isOptionForScriptingCompilerPlugin(option: String)
= option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-gradle") = option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-compiler")
val extraArguments = compileArguments.filter { val extraArguments = compileArguments.filter {
it.startsWith("-X") && !isOptionForScriptingCompilerPlugin(it) it.startsWith("-X") && !isOptionForScriptingCompilerPlugin(it)