From ef93dd523e4c46d7b6f69fbe9f928df2517282a1 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 4 Aug 2016 05:03:35 -0800 Subject: [PATCH] Fix the version range problem. --- .../kotlin/com/beust/kobalt/maven/aether/Aether.kt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt index 02cb5ac6..886763b3 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt @@ -142,7 +142,7 @@ class Aether(localRepo: File, val settings: KobaltSettings, val eventBus: EventB private val kobaltRepositories: List get() = Kobalt.repos.map { - RemoteRepository.Builder("maven", "default", it.url) + RemoteRepository.Builder(null, "default", it.url) // .setSnapshotPolicy(RepositoryPolicy(false, null, null)) .build().let { repository -> val proxyConfigs = settings.proxyConfigs ?: return@map repository @@ -152,14 +152,8 @@ 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 rangeRequest(a: Artifact): VersionRangeRequest + = VersionRangeRequest(a, kobaltRepositories, "RELEASE") private fun collectRequest(artifact: Artifact, scope: Scope?): CollectRequest { with(CollectRequest()) { @@ -209,7 +203,7 @@ class Aether(localRepo: File, val settings: KobaltSettings, val eventBus: EventB if (KobaltAether.isRangeVersion(artifact.version)) { val request = rangeRequest(artifact) val v = system.resolveVersionRange(session, request) - val highestVersion = v.versions.last { ! it.toString().contains("-")}.toString() + val highestVersion = v.highestVersion.toString() val ar = DefaultArtifact(artifact.groupId, artifact.artifactId, artifact.classifier, artifact.extension, highestVersion) listOf(AetherResult(ar, request.repositories[0]))