1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00

Refactor.

This commit is contained in:
Cedric Beust 2015-10-30 18:52:36 -07:00
parent fe47e70732
commit 00722cc637

View file

@ -51,10 +51,6 @@ public class MavenDependency @Inject constructor(mavenId: MavenId,
fun create(id: String, ex: ExecutorService = executor) : IClasspathDependency { fun create(id: String, ex: ExecutorService = executor) : IClasspathDependency {
return depFactory.create(id, ex) return depFactory.create(id, ex)
} }
fun _toId(g: String, a: String, packaging: String?, v: String) =
if (packaging.isNullOrBlank()) "$g:$a:$v"
else "$g:$a:$packaging:$v"
} }
@ -63,11 +59,10 @@ public class MavenDependency @Inject constructor(mavenId: MavenId,
override val id = mavenId.toId override val id = mavenId.toId
override fun toMavenDependencies(): org.apache.maven.model.Dependency { override fun toMavenDependencies(): org.apache.maven.model.Dependency {
with(org.apache.maven.model.Dependency()) { return org.apache.maven.model.Dependency().apply {
setGroupId(groupId) setGroupId(groupId)
setArtifactId(artifactId) setArtifactId(artifactId)
setVersion(version) setVersion(version)
return this
} }
} }
@ -75,7 +70,7 @@ public class MavenDependency @Inject constructor(mavenId: MavenId,
return Versions.toLongVersion(version).compareTo(Versions.toLongVersion(other.version)) return Versions.toLongVersion(version).compareTo(Versions.toLongVersion(other.version))
} }
override val shortId = groupId + ":" + artifactId + ":" override val shortId = "$groupId:$artifactId:"
override fun directDependencies() : List<IClasspathDependency> { override fun directDependencies() : List<IClasspathDependency> {
val result = arrayListOf<IClasspathDependency>() val result = arrayListOf<IClasspathDependency>()