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

get rid of the return by making the throw clause bigger.

Browse source 
I'm not sure what version I like better. small try blocks are also nice.
This commit is contained in:
Christoph Sturm 2015-12-10 08:40:24 +01:00
parent 77eec73bd0
commit aafb06fada
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt
View file

@ -1,10 +1,10 @@
package com.beust.kobalt.misc package com.beust.kobalt.misc
import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.KobaltException
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.dependency.MavenDependency
import com.beust.kobalt.maven.MavenId import com.beust.kobalt.maven.MavenId
import com.beust.kobalt.maven.dependency.MavenDependency
import javax.inject.Inject import javax.inject.Inject
/** /**
@ -21,19 +21,17 @@ public class CheckVersions @Inject constructor(val depFactory : DepFactory,
arrayListOf(it.compileDependencies, it.testDependencies).forEach { cds -> arrayListOf(it.compileDependencies, it.testDependencies).forEach { cds ->
cds.forEach { compileDependency -> cds.forEach { compileDependency ->
if (MavenId.isMavenId(compileDependency.id)) { if (MavenId.isMavenId(compileDependency.id)) {
val dep: IClasspathDependency
try { try {
dep = depFactory.create(compileDependency.shortId, executor, false /* go remote */) val dep = depFactory.create(compileDependency.shortId, executor, false /* go remote */)
} catch(e: Exception) { if (dep is MavenDependency) {
log(1, "cannot resolve ${compileDependency.shortId}. ignoring") val other = compileDependency as MavenDependency
return@forEach if (dep.id != compileDependency.id
} && Versions.toLongVersion(dep.version) > Versions.toLongVersion(other.version)) {
if (dep is MavenDependency) { newVersions.add(dep.id)
val other = compileDependency as MavenDependency }
if (dep.id != compileDependency.id
&& Versions.toLongVersion(dep.version) > Versions.toLongVersion(other.version)) {
newVersions.add(dep.id)
} }
} catch(e: KobaltException) {
log(1, "cannot resolve ${compileDependency.shortId}. ignoring")
} }
} }
} }