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

GITHUB-326: Fix crash with file dependencies.

Browse source 
Fixes https://github.com/cbeust/kobalt/issues/326.
This commit is contained in:
Cedric Beust 2017-02-14 10:19:44 -08:00
parent d948f5ec5d
commit 456d8365bd
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/kotlin/com/beust/kobalt/app/remote/RemoteDependencyData.kt
View file

@ -10,7 +10,6 @@ import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.internal.TaskManager import com.beust.kobalt.internal.TaskManager
import com.beust.kobalt.internal.build.BuildFile import com.beust.kobalt.internal.build.BuildFile
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.MavenId
import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
@ -82,13 +81,15 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
fun mapOfLatestVersions(l: List<DependencyData>) : Map<String, String> { fun mapOfLatestVersions(l: List<DependencyData>) : Map<String, String> {
fun p(l: List<DependencyData>, latestVersions: java.util.HashMap<String, String>) { fun p(l: List<DependencyData>, latestVersions: java.util.HashMap<String, String>) {
l.forEach { l.forEach {
val mid = MavenId.create(it.id) val mid = dependencyManager.create(it.id)
val shortId = mid.artifactId + ":" + mid.artifactId if (mid.isMaven) {
val currentLatest = latestVersions[shortId] val shortId = mid.shortId
if (currentLatest == null) latestVersions[shortId] = mid.version!! val currentLatest = latestVersions[shortId]
else mid.version?.let { v -> if (currentLatest == null) latestVersions[shortId] = mid.version!!
if (Versions.toLongVersion(currentLatest) < Versions.toLongVersion(v)) { else mid.version?.let { v ->
latestVersions[shortId] = v if (Versions.toLongVersion(currentLatest) < Versions.toLongVersion(v)) {
latestVersions[shortId] = v
}
} }
} }
p(it.children, latestVersions) p(it.children, latestVersions)
@ -101,10 +102,11 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
val map = mapOfLatestVersions(result) val map = mapOfLatestVersions(result)
GraphUtil.map(result, { d: DependencyData -> d.children }, GraphUtil.map(result, { d: DependencyData -> d.children },
{d: DependencyData -> {d: DependencyData ->
val mid = MavenId.create(d.id) val mid = dependencyManager.create(d.id)
val shortId = mid.artifactId + ":" + mid.artifactId if (mid.isMaven) {
val version = map[shortId] val version = map[mid.shortId]
d.isLatest = version == mid.version d.isLatest = version == mid.version
}
}) })
return result return result
} }