diff --git a/build/jvm-rules/src/kotlin/kotlin-compiler/compiler.kt b/build/jvm-rules/src/kotlin/kotlin-compiler/compiler.kt index 9d61a84d6a91..40ae3b00117f 100644 --- a/build/jvm-rules/src/kotlin/kotlin-compiler/compiler.kt +++ b/build/jvm-rules/src/kotlin/kotlin-compiler/compiler.kt @@ -75,7 +75,6 @@ fun prepareCompilerConfiguration( configurePlugins( args = args, workingDir = baseDir, - targetLabel = args.mandatorySingle(JvmBuilderFlags.TARGET_LABEL), abiOutputConsumer = abiOutputConsumer, ) { config.add(CompilerPluginRegistrar.COMPILER_PLUGIN_REGISTRARS, it.compilerPluginRegistrar!!) @@ -167,7 +166,7 @@ fun configureModule( @OptIn(ExperimentalCompilerApi::class) fun getDebugInfoAboutPlugins(args: ArgMap, baseDir: Path, targetLabel: String): String { val sb = StringBuilder() - configurePlugins(args = args, workingDir = baseDir, targetLabel = targetLabel, abiOutputConsumer = null) { info -> + configurePlugins(args = args, workingDir = baseDir, abiOutputConsumer = null) { info -> sb.append(info.compilerPluginRegistrar!!.toString()) if (!info.pluginOptions.isEmpty()) { sb.append("(" + info.pluginOptions.joinToString(separator = ", ") + ")") diff --git a/build/jvm-rules/src/kotlin/kotlin-compiler/plugins.kt b/build/jvm-rules/src/kotlin/kotlin-compiler/plugins.kt index f92eb806e8b1..da2b51d0b303 100644 --- a/build/jvm-rules/src/kotlin/kotlin-compiler/plugins.kt +++ b/build/jvm-rules/src/kotlin/kotlin-compiler/plugins.kt @@ -21,13 +21,13 @@ import org.jetbrains.kotlinx.serialization.compiler.extensions.SerializationPlug import java.net.URLClassLoader import java.nio.file.Path +@Suppress("SameParameterValue") private fun cliOptionValue(name: String, value: String) = CliOptionValue(pluginId = "", optionName = name, value = value) @OptIn(ExperimentalCompilerApi::class) internal inline fun configurePlugins( args: ArgMap, workingDir: Path, - targetLabel: String, noinline abiOutputConsumer: ((List) -> Unit)?, consumer: (RegisteredPluginInfo) -> Unit, ) {