diff --git a/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/src/main/kotlin/com/beust/kobalt/BuildScript.kt index 53e4158e..b40718de 100644 --- a/src/main/kotlin/com/beust/kobalt/BuildScript.kt +++ b/src/main/kotlin/com/beust/kobalt/BuildScript.kt @@ -1,12 +1,11 @@ package com.beust.kobalt +import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.api.Kobalt -import com.beust.kobalt.api.Project import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.maven.DepFactory -import com.beust.kobalt.api.IClasspathDependency +import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.misc.KobaltExecutors -import com.beust.kobalt.SystemProperties import java.io.File @Directive @@ -14,7 +13,7 @@ fun homeDir(vararg dirs: String) : String = SystemProperties.homeDir + File.separator + dirs.toArrayList().joinToString(File.separator) @Directive -fun file(file: String) : String = IClasspathDependency.PREFIX_FILE + file +fun file(file: String) : String = FileDependency.PREFIX_FILE + file @Directive fun plugins(vararg dependency : IClasspathDependency) { diff --git a/src/main/kotlin/com/beust/kobalt/api/IClasspathDependency.kt b/src/main/kotlin/com/beust/kobalt/api/IClasspathDependency.kt index 36db63b5..9ee3f4dc 100644 --- a/src/main/kotlin/com/beust/kobalt/api/IClasspathDependency.kt +++ b/src/main/kotlin/com/beust/kobalt/api/IClasspathDependency.kt @@ -10,10 +10,6 @@ import java.util.concurrent.Future * which represents a dependency living in a Maven repo. */ interface IClasspathDependency { - companion object { - val PREFIX_FILE: String = "file://" - } - /** Identifier for this dependency */ val id: String diff --git a/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt b/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt index 17230e8c..210e08db 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt @@ -1,8 +1,8 @@ package com.beust.kobalt.maven import com.beust.kobalt.KobaltException -import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.api.IClasspathDependency +import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.misc.KobaltExecutors import java.util.concurrent.ExecutorService @@ -19,8 +19,8 @@ public class DepFactory @Inject constructor(val localRepo: LocalRepo, */ public fun create(id: String, executor: ExecutorService, localFirst : Boolean = true) : IClasspathDependency { - if (id.startsWith(IClasspathDependency.PREFIX_FILE)) { - return FileDependency(id.substring(IClasspathDependency.PREFIX_FILE.length)) + if (id.startsWith(FileDependency.PREFIX_FILE)) { + return FileDependency(id.substring(FileDependency.PREFIX_FILE.length)) } else { val mavenId = MavenId(id) var version = mavenId.version diff --git a/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt b/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt index 17c06817..0d13b8b5 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt @@ -1,6 +1,6 @@ package com.beust.kobalt.maven -import com.beust.kobalt.api.IClasspathDependency +import com.beust.kobalt.maven.dependency.FileDependency import com.google.inject.assistedinject.Assisted import java.io.* import java.net.HttpURLConnection @@ -25,8 +25,8 @@ class Kurl @Inject constructor(@Assisted val url: String) { val result = if (connection is HttpURLConnection) { (connection as HttpURLConnection).responseCode == 200 - } else if (url.startsWith(IClasspathDependency.PREFIX_FILE)) { - val fileName = url.substring(IClasspathDependency.PREFIX_FILE.length) + } else if (url.startsWith(FileDependency.PREFIX_FILE)) { + val fileName = url.substring(FileDependency.PREFIX_FILE.length) File(fileName).exists() } else { false diff --git a/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt b/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt index 9bb0e077..368e37a4 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt @@ -6,7 +6,11 @@ import org.apache.maven.model.Dependency import java.io.File open public class FileDependency(open val fileName: String) : IClasspathDependency, Comparable { - override val id = IClasspathDependency.PREFIX_FILE + fileName + companion object { + val PREFIX_FILE: String = "file://" + } + + override val id = PREFIX_FILE + fileName override val jarFile = CompletedFuture(File(fileName))