From 035bf4a61390a73616bdb4f98052f4e6d4741d77 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 28 Jul 2016 02:12:20 -0800 Subject: [PATCH] Fix test classpath for dependent projects. --- .../beust/kobalt/maven/DependencyManager.kt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt index 76371a39..0608c6ad 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt @@ -183,14 +183,18 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val return emptyList() } else { val result = arrayListOf() - project.dependsOn.forEach { p -> - KFiles.joinDir(p.directory, p.classesDir(context)).let { classDir -> - // A project is allowed not to have any kobaltBuild/classes directory if it doesn't have - // any sources - if (File(classDir).exists()) { - result.add(FileDependency(KFiles.joinDir(p.directory, p.classesDir(context)))) - } + + fun maybeAddClassDir(classDir: String) { + // A project is allowed not to have any kobaltBuild/classes or test-classes directory if it doesn't have + // any sources + if (File(classDir).exists()) { + result.add(FileDependency(classDir)) } + } + + project.dependsOn.forEach { p -> + maybeAddClassDir(KFiles.joinDir(p.directory, p.classesDir(context))) + maybeAddClassDir(KFiles.makeOutputTestDir(project).path) val otherDependencies = calculateDependencies(p, context, scopeFilters) result.addAll(otherDependencies)