Compiler&plugin deprecations cleanup: *array -> *arrayOf, copyToArray -> toTypedArray.

Original commit: 2c31a1a345
This commit is contained in:
Ilya Gorbunov
2015-06-25 17:35:40 +03:00
parent e29047d719
commit 85230d7071
2 changed files with 3 additions and 3 deletions
@@ -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
@@ -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]!!