From 6ce92f6d0d27038344c79af017dabea071c23b0a Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Fri, 9 Aug 2013 14:35:06 +0400
Subject: [PATCH] code polishing

---
 .../jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 14 ++++++--------
 .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt     |  5 +----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 1cf7b0e4af3..09cc1c5f9fc 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -38,6 +38,8 @@ import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.Dependency
 import java.util.HashSet
 
+val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"
+
 open class KotlinPlugin: Plugin<Project> {
 
     public override fun apply(project: Project) {
@@ -50,7 +52,7 @@ open class KotlinPlugin: Plugin<Project> {
         configureKDoc(project, javaPluginConvention)
 
         val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String
-        project.getExtensions().add(KotlinCompile.DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-jdk-annotations:$version"))
+        project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-jdk-annotations:$version"))
     }
 
 
@@ -167,7 +169,7 @@ open class KotlinAndroidPlugin: Plugin<Project> {
 
         })
         val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String
-        project.getExtensions().add(KotlinCompile.DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-jdk-annotations:$version",
+        project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-jdk-annotations:$version",
                                                                                                                 "org.jetbrains.kotlin:kotlin-android-sdk-annotations:$version"));
     }
 
@@ -275,12 +277,8 @@ open class GradleUtils() {
             val dependencyHandler : DependencyHandler = project.getBuildscript().getDependencies()
             val configurationsContainer : ConfigurationContainer = project.getBuildscript().getConfigurations()
 
-            val deps = HashSet<Dependency>()
-            for (coordinate in coordinates) {
-                deps.add(dependencyHandler.create(coordinate))
-            }
-            val array :  Array<Dependency?> = deps.toArray(Array<Dependency?>(deps.size(),{null}))
-            val configuration = configurationsContainer.detachedConfiguration(*array)
+            val deps = coordinates.map { dependencyHandler.create(it) }
+            val configuration = configurationsContainer.detachedConfiguration(*deps.toArray(array<Dependency>()))
 
             return configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!!
         }
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 6e4713b7cbb..cffde83fbfa 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -24,13 +24,10 @@ import org.gradle.api.logging.Logging
 import org.apache.commons.lang.StringUtils
 import org.gradle.api.initialization.dsl.ScriptHandler
 import org.apache.commons.io.FileUtils
+import org.jetbrains.kotlin.gradle.plugin.*
 
 public open class KotlinCompile(): AbstractCompile() {
 
-    class object {
-        val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"
-    }
-
     val srcDirsRoots = HashSet<File>()
     val compiler = K2JVMCompiler()
     val logger = Logging.getLogger(getClass())