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

Fix the version range resolution.

Browse source
This commit is contained in:
Cedric Beust 2016-08-02 22:52:48 -08:00
parent efca7320bb
commit faa4bc17ce
1 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,8 +24,12 @@ import org.eclipse.aether.collection.CollectResult
import org.eclipse.aether.graph.Dependency import org.eclipse.aether.graph.Dependency
import org.eclipse.aether.graph.DependencyFilter import org.eclipse.aether.graph.DependencyFilter
import org.eclipse.aether.graph.DependencyNode import org.eclipse.aether.graph.DependencyNode
import org.eclipse.aether.repository.ArtifactRepository
import org.eclipse.aether.repository.RemoteRepository import org.eclipse.aether.repository.RemoteRepository
import org.eclipse.aether.resolution.* import org.eclipse.aether.resolution.DependencyRequest
import org.eclipse.aether.resolution.DependencyResolutionException
import org.eclipse.aether.resolution.VersionRangeRequest
import org.eclipse.aether.resolution.VersionRangeResult
import org.eclipse.aether.transfer.ArtifactNotFoundException import org.eclipse.aether.transfer.ArtifactNotFoundException
import org.eclipse.aether.util.artifact.JavaScopes import org.eclipse.aether.util.artifact.JavaScopes
import org.eclipse.aether.util.filter.AndDependencyFilter import org.eclipse.aether.util.filter.AndDependencyFilter
@ -70,6 +74,8 @@ enum class Scope(val scope: String, val dependencyLambda: (Project) -> List<ICla
class DependencyResult(val dependency: IClasspathDependency, val repoUrl: String) class DependencyResult(val dependency: IClasspathDependency, val repoUrl: String)
class AetherResult(val artifact: Artifact, val repository: ArtifactRepository)
class KobaltAether @Inject constructor (val settings: KobaltSettings, val aether: Aether) { class KobaltAether @Inject constructor (val settings: KobaltSettings, val aether: Aether) {
/** /**
* Create an IClasspathDependency from a Kobalt id. * Create an IClasspathDependency from a Kobalt id.
@ -102,7 +108,7 @@ class KobaltAether @Inject constructor (val settings: KobaltSettings, val aether
} }
fun resolveToArtifact(id: String, artifactScope: Scope? = null, filterScopes: Collection<Scope> = emptyList()) fun resolveToArtifact(id: String, artifactScope: Scope? = null, filterScopes: Collection<Scope> = emptyList())
: ArtifactResult? { : AetherResult? {
log(ConsoleRepositoryListener.LOG_LEVEL, "Resolving $id") log(ConsoleRepositoryListener.LOG_LEVEL, "Resolving $id")
val results = aether.resolve(DefaultArtifact(MavenId.toKobaltId(id)), artifactScope, filterScopes) val results = aether.resolve(DefaultArtifact(MavenId.toKobaltId(id)), artifactScope, filterScopes)
if (results.size > 0) { if (results.size > 0) {
@ -142,6 +148,15 @@ class Aether(localRepo: File, val settings: KobaltSettings, val eventBus: EventB
} }
} }
private fun rangeRequest(a: Artifact): VersionRangeRequest {
with(VersionRangeRequest()) {
artifact = a
repositories = kobaltRepositories
return this
}
}
private fun collectRequest(artifact: Artifact, scope: Scope?): CollectRequest { private fun collectRequest(artifact: Artifact, scope: Scope?): CollectRequest {
with(CollectRequest()) { with(CollectRequest()) {
root = Dependency(artifact, scope?.scope) root = Dependency(artifact, scope?.scope)
@ -151,7 +166,7 @@ class Aether(localRepo: File, val settings: KobaltSettings, val eventBus: EventB
} }
} }
fun latestArtifact(group: String, artifactId: String, extension: String = "jar"): ArtifactResult { fun latestArtifact(group: String, artifactId: String, extension: String = "jar"): AetherResult {
val artifact = DefaultArtifact(group, artifactId, extension, "(0,]") val artifact = DefaultArtifact(group, artifactId, extension, "(0,]")
val resolved = resolveVersion(artifact) val resolved = resolveVersion(artifact)
if (resolved != null) { if (resolved != null) {
@ -174,8 +189,8 @@ class Aether(localRepo: File, val settings: KobaltSettings, val eventBus: EventB
return result return result
} }
fun resolve(artifact: Artifact, artifactScope: Scope?, filterScopes: Collection<Scope>): List<ArtifactResult> { fun resolve(artifact: Artifact, artifactScope: Scope?, filterScopes: Collection<Scope>): List<AetherResult> {
fun manageException(ex: Exception, artifact: Artifact): List<ArtifactResult> { fun manageException(ex: Exception, artifact: Artifact): List<AetherResult> {
if (artifact.extension == "pom") { if (artifact.extension == "pom") {
// Only display a warning for .pom files. Not resolving a .jar or other artifact // Only display a warning for .pom files. Not resolving a .jar or other artifact
// is not necessarily an error as long as there is a pom file. // is not necessarily an error as long as there is a pom file.
@ -186,8 +201,19 @@ class Aether(localRepo: File, val settings: KobaltSettings, val eventBus: EventB
try { try {
val scopeFilter = Scope.toFilter(filterScopes) val scopeFilter = Scope.toFilter(filterScopes)
val result =
if (artifact.version.contains(",")) {
val request = rangeRequest(artifact)
val v = system.resolveVersionRange(session, request)
val ar = DefaultArtifact(artifact.groupId, artifact.artifactId, artifact.classifier,
artifact.extension, v.highestVersion.toString())
listOf(AetherResult(ar, request.repositories[0]))
} else {
val dependencyRequest = DependencyRequest(collectRequest(artifact, artifactScope), scopeFilter) val dependencyRequest = DependencyRequest(collectRequest(artifact, artifactScope), scopeFilter)
val result = system.resolveDependencies(session, dependencyRequest).artifactResults system.resolveDependencies(session, dependencyRequest).artifactResults.map {
AetherResult(it.artifact, it.repository)
}
}
return result return result
} catch(ex: ArtifactNotFoundException) { } catch(ex: ArtifactNotFoundException) {
return manageException(ex, artifact) return manageException(ex, artifact)