diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 46b432d6321..84a21e24908 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -248,7 +248,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() - fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: arrayOf()), *cp.toTypedArray()) + fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: emptyArray()), *cp.toTypedArray()) for (argumentProvider in ServiceLoader.load(javaClass())) { // appending to pluginOptions diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index bc116030047..05d889ce991 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -348,7 +348,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val jdk = addJdk("my jdk") val moduleDependencies = readModuleDependencies() if (moduleDependencies == null) { - addModule("module", array(getAbsolutePath("src")), null, null, jdk) + addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) @@ -356,7 +356,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } else { val nameToModule = moduleDependencies.keySet() - .keysToMap { addModule(it, array(getAbsolutePath(it + "/src")), null, null, jdk)!! } + .keysToMap { addModule(it, arrayOf(getAbsolutePath(it + "/src")), null, null, jdk)!! } for ((moduleName, dependencies) in moduleDependencies) { val module = nameToModule[moduleName]!!