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

jvm-abi-gen: mark as supporting K2 (in new mode)

Browse Source
This commit is contained in:
pyos
2022-06-09 12:21:00 +02:00
committed by Dmitriy Novozhilov
parent 526e46cffc
commit 60405237d2
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiComponentRegistrar.kt
+7
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
import org.jetbrains.kotlin.codegen.extensions.ClassFileFactoryFinalizerExtension import org.jetbrains.kotlin.codegen.extensions.ClassFileFactoryFinalizerExtension
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
@@ -20,6 +21,9 @@ class JvmAbiComponentRegistrar : ComponentRegistrar {
override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) { override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
val outputPath = configuration.getNotNull(JvmAbiConfigurationKeys.OUTPUT_PATH) val outputPath = configuration.getNotNull(JvmAbiConfigurationKeys.OUTPUT_PATH)
if (configuration.get(JvmAbiConfigurationKeys.LEGACY_ABI_GEN, false)) { if (configuration.get(JvmAbiConfigurationKeys.LEGACY_ABI_GEN, false)) {
require(!configuration.getBoolean(CommonConfigurationKeys.USE_FIR)) {
"Legacy jvm-abi-gen does not support K2 compiler."
}
// Use the two-pass implementation // Use the two-pass implementation
require(!outputPath.endsWith(".jar")) { require(!outputPath.endsWith(".jar")) {
"Legacy jvm-abi-gen does not support jar output." "Legacy jvm-abi-gen does not support jar output."
@@ -38,4 +42,7 @@ class JvmAbiComponentRegistrar : ComponentRegistrar {
ClassFileFactoryFinalizerExtension.registerExtension(project, outputExtension) ClassFileFactoryFinalizerExtension.registerExtension(project, outputExtension)
} }
} }
override val supportsK2: Boolean
get() = true
} }