diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/BundledCompilerPlugins.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/BundledCompilerPlugins.kt deleted file mode 100644 index 555765b1297..00000000000 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/BundledCompilerPlugins.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.cli.jvm - -import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor -import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar - -object BundledCompilerPlugins { - val componentRegistrars: List - get() = emptyList() - - val commandLineProcessors: List - get() = emptyList() -} diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/plugins/PluginCliParser.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/plugins/PluginCliParser.kt index cab932d3f20..e4527bd618e 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/plugins/PluginCliParser.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/plugins/PluginCliParser.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil -import org.jetbrains.kotlin.cli.jvm.BundledCompilerPlugins import org.jetbrains.kotlin.compiler.plugin.* import org.jetbrains.kotlin.config.CompilerConfiguration import java.io.File @@ -68,7 +67,6 @@ object PluginCliParser { ) val componentRegistrars = ServiceLoader.load(ComponentRegistrar::class.java, classLoader).toMutableList() - componentRegistrars.addAll(BundledCompilerPlugins.componentRegistrars) configuration.addAll(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, componentRegistrars) processPluginOptions(pluginOptions, configuration, classLoader) @@ -85,9 +83,7 @@ object PluginCliParser { } ?: mapOf() // TODO issue a warning on using deprecated command line processors when all official plugin migrate to the newer convention - - val commandLineProcessors = ServiceLoader.load(CommandLineProcessor::class.java, classLoader).toMutableList() - commandLineProcessors.addAll(BundledCompilerPlugins.commandLineProcessors) + val commandLineProcessors = ServiceLoader.load(CommandLineProcessor::class.java, classLoader) for (processor in commandLineProcessors) { val declaredOptions = processor.pluginOptions.associateBy { it.optionName }