From 85230d7071bc1e862d186c682ff58f5e5b92bce1 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 25 Jun 2015 17:35:40 +0300
Subject: [PATCH] Compiler&plugin deprecations cleanup: *array -> *arrayOf,
 copyToArray -> toTypedArray.

Original commit: 2c31a1a3458cdadbbbd4a4a2074cea40dc2f5e8d
---
 .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt       | 2 +-
 .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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<String>?, cp: List<String>) = arrayOf(*(strings ?: arrayOf<String>()), *cp.toTypedArray())
+        fun concatenate(strings: Array<String>?, cp: List<String>) = arrayOf(*(strings ?: emptyArray()), *cp.toTypedArray())
 
         for (argumentProvider in ServiceLoader.load(javaClass<KotlinJpsCompilerArgumentsProvider>())) {
             // 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]!!