From 5451477eb0f72973ad363562d91ed77ad3b45846 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 26 Jun 2023 13:03:20 +0200 Subject: [PATCH] Minor, remove useLegacyAbiGen test mode Legacy jvm-abi-gen was removed in KT-55375. --- .../test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt index f25f4750b34..2f3b0973c44 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt @@ -76,10 +76,9 @@ abstract class BaseJvmAbiTest : TestCase() { freeArgs = listOf(compilation.srcDir.canonicalPath) classpath = (abiDependencies + kotlinJvmStdlib).joinToString(File.pathSeparator) { it.canonicalPath } pluginClasspaths = arrayOf(abiPluginJar.canonicalPath) - pluginOptions = listOfNotNull( + pluginOptions = arrayOf( abiOption(JvmAbiCommandLineProcessor.OUTPUT_PATH_OPTION.optionName, compilation.abiDir.canonicalPath), - if (useLegacyAbiGen) abiOption("useLegacyAbiGen", "true") else null - ).toTypedArray() + ) destination = compilation.destinationDir.canonicalPath noSourceDebugExtension = InTextDirectivesUtils.findStringWithPrefixes(directives, "// NO_SOURCE_DEBUG_EXTENSION") != null @@ -119,9 +118,6 @@ abstract class BaseJvmAbiTest : TestCase() { } } - protected open val useLegacyAbiGen: Boolean - get() = false - protected val kotlinJvmStdlib = File("dist/kotlinc/lib/kotlin-stdlib.jar").also { check(it.exists()) { "Stdlib file '$it' does not exist" } }