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

Better message when a dependency can't be resolved.

Browse source
This commit is contained in:
Cedric Beust 2016-07-13 02:24:20 -08:00
parent e6efdc2f75
commit 3ac313b7bf
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
vararg allDependencies: List<IClasspathDependency>): List<IClasspathDependency> {
val result = arrayListOf<IClasspathDependency>()
allDependencies.forEach { dependencies ->
result.addAll(transitiveClosure(dependencies))
result.addAll(transitiveClosure(dependencies, project?.name))
}
result.addAll(runClasspathContributors(project, context))
result.addAll(dependentProjectDependencies(project, context))
@ -111,7 +111,8 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
* Return the transitive closure of the dependencies *without* running the classpath contributors.
* TODO: This should be private, everyone should be calling calculateDependencies().
*/
fun transitiveClosure(dependencies : List<IClasspathDependency>, indent : String = " "):
fun transitiveClosure(dependencies : List<IClasspathDependency>, requiredBy: String? = null,
indent : String = " "):
List<IClasspathDependency> {
val executor = executors.newExecutor("JvmCompiler}", 10)
@ -122,7 +123,8 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
result.add(projectDependency)
projectDependency.id.let {
result.add(create(it))
val downloaded = transitiveClosure(projectDependency.directDependencies(), indent + " ")
val downloaded = transitiveClosure(projectDependency.directDependencies(), projectDependency.id,
indent + " ")
result.addAll(downloaded)
}
@ -132,7 +134,8 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
val nonexistent = reordered.filter{ ! it.jarFile.get().exists() }
if (nonexistent.any()) {
log(2, "[Warning] Nonexistent dependencies: $nonexistent")
throw KobaltException("Couldn't resolve dependency $nonexistent"
+ (if (requiredBy != null) " required by $requiredBy" else ""))
}
val result2 = reordered.filter {