diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt index 62b88ed8994..e1dcde53ba9 100644 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt +++ b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt @@ -21,10 +21,8 @@ import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.diagnostics.Severity -import org.jetbrains.kotlin.incremental.LocalFileKotlinClass import org.jetbrains.kotlin.incremental.isClassFile import org.jetbrains.kotlin.jvm.abi.asm.AbiClassBuilder -import org.jetbrains.kotlin.jvm.abi.asm.ABI_EXTENSION_ASM_API_VERSION import org.jetbrains.kotlin.jvm.abi.asm.FilterInnerClassesVisitor import org.jetbrains.kotlin.jvm.abi.asm.InnerClassesCollectingVisitor import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass @@ -158,7 +156,7 @@ class JvmAbiAnalysisHandlerExtension( output.delete() } else { output.transform { writer -> - FilterInnerClassesVisitor(classesToRemove, ABI_EXTENSION_ASM_API_VERSION, writer) + FilterInnerClassesVisitor(classesToRemove, Opcodes.API_VERSION, writer) } } } diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt deleted file mode 100644 index e98b9a8d5d8..00000000000 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt +++ /dev/null @@ -1,10 +0,0 @@ -/* - * 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. - */ - -package org.jetbrains.kotlin.jvm.abi.asm - -import org.jetbrains.org.objectweb.asm.Opcodes - -internal const val ABI_EXTENSION_ASM_API_VERSION = Opcodes.API_VERSION \ No newline at end of file diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt index 382cd82930e..6093850cae7 100644 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt +++ b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt @@ -1,8 +1,9 @@ package org.jetbrains.kotlin.jvm.abi.asm import org.jetbrains.org.objectweb.asm.ClassVisitor +import org.jetbrains.org.objectweb.asm.Opcodes -internal class InnerClassesCollectingVisitor : ClassVisitor(ABI_EXTENSION_ASM_API_VERSION) { +internal class InnerClassesCollectingVisitor : ClassVisitor(Opcodes.API_VERSION) { lateinit var ownInternalName: String private set diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt index a848e1da743..53d91da4700 100644 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt +++ b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt @@ -16,7 +16,7 @@ internal class ReplaceWithEmptyMethodVisitor( desc: String, signature: String?, exceptions: Array? -) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions, api = ABI_EXTENSION_ASM_API_VERSION) { +) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions, api = Opcodes.API_VERSION) { override fun performTransformations(methodNode: MethodNode) { methodNode.instructions.clear() methodNode.localVariables.clear() diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt index a947292b8a8..800b4893a89 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt @@ -3,7 +3,6 @@ package org.jetbrains.kotlin.jvm.abi import com.intellij.openapi.util.io.systemIndependentPath import org.jetbrains.kotlin.codegen.BytecodeListingTextCollectingVisitor import org.jetbrains.kotlin.incremental.isClassFile -import org.jetbrains.kotlin.jvm.abi.asm.ABI_EXTENSION_ASM_API_VERSION import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.jetbrains.org.objectweb.asm.* import java.io.File @@ -22,7 +21,7 @@ abstract class AbstractJvmAbiContentTest : BaseJvmAbiTest() { val visitor = BytecodeListingTextCollectingVisitor( filter = BytecodeListingTextCollectingVisitor.Filter.EMPTY, withSignatures = false, - api = ABI_EXTENSION_ASM_API_VERSION + api = Opcodes.API_VERSION ) reader.accept(visitor, 0) classToBytecode[classFile] = visitor.text