diff --git a/src/main/kotlin/com/beust/kobalt/api/Project.kt b/src/main/kotlin/com/beust/kobalt/api/Project.kt index 255a3b19..d597947a 100644 --- a/src/main/kotlin/com/beust/kobalt/api/Project.kt +++ b/src/main/kotlin/com/beust/kobalt/api/Project.kt @@ -64,17 +64,18 @@ open public class Project( @Directive public fun dependencies(init: Dependencies.() -> Unit) : Dependencies { - dependencies = Dependencies(this, compileDependencies, compileProvidedDependencies) + dependencies = Dependencies(this, compileDependencies, compileProvidedDependencies, compileRuntimeDependencies) dependencies!!.init() return dependencies!! } val compileDependencies : ArrayList = arrayListOf() val compileProvidedDependencies : ArrayList = arrayListOf() + val compileRuntimeDependencies : ArrayList = arrayListOf() @Directive public fun dependenciesTest(init: Dependencies.() -> Unit) : Dependencies { - dependencies = Dependencies(this, testDependencies, testProvidedDependencies) + dependencies = Dependencies(this, testDependencies, testProvidedDependencies, compileRuntimeDependencies) dependencies!!.init() return dependencies!! } @@ -91,7 +92,8 @@ public class Sources(val project: Project, val sources: ArrayList) { } public class Dependencies(val project: Project, val dependencies: ArrayList, - val providedDependencies: ArrayList) { + val providedDependencies: ArrayList, + val runtimeDependencies: ArrayList) { @Directive fun compile(vararg dep: String) { dep.forEach { dependencies.add(MavenDependency.create(it)) } @@ -101,5 +103,10 @@ public class Dependencies(val project: Project, val dependencies: ArrayList + dep.map { it.jarFile.get() }.forEach { + if (!isExcluded(it, jar.excludes)) { + allFiles.add(IncludedFile(arrayListOf(FileSpec(it.path)))) + } } } }