azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code polishing

Browse Source
This commit is contained in:
Nikita Skvortsov
2013-08-09 14:35:06 +04:00
parent e786e62fd7
commit 6ce92f6d0d
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+6 -8
View File
@@ -38,6 +38,8 @@ import org.gradle.api.artifacts.ConfigurationContainer
import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.Dependency
import java.util.HashSet import java.util.HashSet
val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"
open class KotlinPlugin: Plugin<Project> { open class KotlinPlugin: Plugin<Project> {
public override fun apply(project: Project) { public override fun apply(project: Project) {
@@ -50,7 +52,7 @@ open class KotlinPlugin: Plugin<Project> {
configureKDoc(project, javaPluginConvention) configureKDoc(project, javaPluginConvention)
val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String 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 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")); "org.jetbrains.kotlin:kotlin-android-sdk-annotations:$version"));
} }
@@ -275,12 +277,8 @@ open class GradleUtils() {
val dependencyHandler : DependencyHandler = project.getBuildscript().getDependencies() val dependencyHandler : DependencyHandler = project.getBuildscript().getDependencies()
val configurationsContainer : ConfigurationContainer = project.getBuildscript().getConfigurations() val configurationsContainer : ConfigurationContainer = project.getBuildscript().getConfigurations()
val deps = HashSet<Dependency>() val deps = coordinates.map { dependencyHandler.create(it) }
for (coordinate in coordinates) { val configuration = configurationsContainer.detachedConfiguration(*deps.toArray(array<Dependency>()))
deps.add(dependencyHandler.create(coordinate))
}
val array : Array<Dependency?> = deps.toArray(Array<Dependency?>(deps.size(),{null}))
val configuration = configurationsContainer.detachedConfiguration(*array)
return configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!! return configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!!
} }
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+1 -4
View File
@@ -24,13 +24,10 @@ import org.gradle.api.logging.Logging
import org.apache.commons.lang.StringUtils import org.apache.commons.lang.StringUtils
import org.gradle.api.initialization.dsl.ScriptHandler import org.gradle.api.initialization.dsl.ScriptHandler
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
import org.jetbrains.kotlin.gradle.plugin.*
public open class KotlinCompile(): AbstractCompile() { public open class KotlinCompile(): AbstractCompile() {
class object {
val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"
}
val srcDirsRoots = HashSet<File>() val srcDirsRoots = HashSet<File>()
val compiler = K2JVMCompiler() val compiler = K2JVMCompiler()
val logger = Logging.getLogger(getClass()) val logger = Logging.getLogger(getClass())