[CLI] Restore K2JVMCompilerArguments.classpath and javaModulePath

to support IDEs < 2023.2

Reverts:
- 9dcd40d7b7
- fb66764c4d

KTIJ-25227
This commit is contained in:
Sebastian Sellmair
2023-04-17 08:25:29 +02:00
committed by Space Team
parent 7fe3c5c423
commit 5d0bf2de24
15 changed files with 29 additions and 38 deletions
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
import org.junit.jupiter.api.fail
import java.io.File
import java.io.FilenameFilter
abstract class AbstractIncrementalFirJvmWithPluginCompilerRunnerTest : AbstractIncrementalFirJvmCompilerRunnerTest() {
companion object {
@@ -35,7 +34,7 @@ abstract class AbstractIncrementalFirJvmWithPluginCompilerRunnerTest : AbstractI
val annotationsJar = findJar(ANNOTATIONS_JAR_DIR, ANNOTATIONS_JAR_NAME, ":plugins:fir-plugin-prototype:plugin-annotations:jar")
val pluginJar = findJar(PLUGIN_JAR_DIR, PLUGIN_JAR_NAME, ":plugins:fir-plugin-prototype:jar")
classpath = classpath?.plus(annotationsJar)
classpath += "${File.pathSeparator}$annotationsJar"
pluginClasspaths = arrayOf(pluginJar)
}
@@ -74,7 +74,7 @@ abstract class BaseJvmAbiTest : TestCase() {
val compiler = K2JVMCompiler()
val args = compiler.createArguments().apply {
freeArgs = listOf(compilation.srcDir.canonicalPath)
classpath = (abiDependencies + kotlinJvmStdlib).map { it.canonicalPath }.toTypedArray()
classpath = (abiDependencies + kotlinJvmStdlib).joinToString(File.pathSeparator) { it.canonicalPath }
pluginClasspaths = arrayOf(abiPluginJar.canonicalPath)
pluginOptions = listOfNotNull(
abiOption(JvmAbiCommandLineProcessor.OUTPUT_PATH_OPTION.optionName, compilation.abiDir.canonicalPath),