erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 08:38:13 -07:00
Code Releases Activity

Improve IClasspathDependency.

Browse source
This commit is contained in:
Cedric Beust 2016-03-29 22:53:29 -08:00
parent 8871c47561
commit 40305af8b1
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IClasspathDependency.kt
View file

@ -19,6 +19,9 @@ interface IClasspathDependency {
/** Version for this identifier */ /** Version for this identifier */
val version: String val version: String
/** @return true if this dependency represents a Maven coordinate */
val isMaven: Boolean
/** Absolute path to the jar file on the local file system */ /** Absolute path to the jar file on the local file system */
val jarFile: Future<File> val jarFile: Future<File>

14
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/MavenId.kt
View file

@ -21,14 +21,6 @@ class MavenId private constructor(val groupId: String, val artifactId: String, v
size == 3 || size == 4 size == 3 || size == 4
} }
private fun isVersion(s: String, id: String): Boolean {
try {
return s[0] == 'v' || Character.isDigit(s[0]) || isRangedVersion(s)
} catch(ex: Exception) {
error("Illegal version found in id \"$id\"")
}
}
fun isRangedVersion(s: String): Boolean { fun isRangedVersion(s: String): Boolean {
return s.first() in listOf('[', '(') && s.last() in listOf(']', ')') return s.first() in listOf('[', '(') && s.last() in listOf(']', ')')
} }
@ -41,6 +33,7 @@ class MavenId private constructor(val groupId: String, val artifactId: String, v
} }
fun toKobaltId(id: String) = if (id.endsWith(":")) id + "(0,]" else id fun toKobaltId(id: String) = if (id.endsWith(":")) id + "(0,]" else id
/** /**
* The main entry point to create Maven Id's. Id's created by this function * The main entry point to create Maven Id's. Id's created by this function
* will run through IMavenIdInterceptors. * will run through IMavenIdInterceptors.
@ -62,8 +55,9 @@ class MavenId private constructor(val groupId: String, val artifactId: String, v
create(toId(groupId, artifactId, packaging, version)) create(toId(groupId, artifactId, packaging, version))
fun toId(groupId: String, artifactId: String, packaging: String? = null, version: String?) = fun toId(groupId: String, artifactId: String, packaging: String? = null, version: String?) =
"$groupId:$artifactId:$version" + "$groupId:$artifactId" +
(if (packaging != null && packaging != "") "@$packaging" else "") (if (packaging != null && packaging != "") ":$packaging" else "") +
":$version"
} }

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt
View file

@ -186,6 +186,8 @@ class AetherDependency(val artifact: Artifact): IClasspathDependency, Comparable
override val version: String = artifact.version override val version: String = artifact.version
override val isMaven = true
private fun toId(a: Artifact) = with(a) { private fun toId(a: Artifact) = with(a) {
groupId + ":" + artifactId + ":" + version groupId + ":" + artifactId + ":" + version
} }

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt
View file

@ -14,6 +14,8 @@ open public class FileDependency(open val fileName: String) : IClasspathDependen
override val version = "0.0" override val version = "0.0"
override val isMaven = false
override val jarFile = CompletedFuture(File(fileName)) override val jarFile = CompletedFuture(File(fileName))
override fun toMavenDependencies(): Dependency { override fun toMavenDependencies(): Dependency {