Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #542 from szabolcsberecz/wip-2156-sbt-plugin-dist-…

…project-dep-khernyo

#2156 - sbt plugin: project dependencies should be included automatically
  • Loading branch information...
commit ed64cdcc5c9d324777f38c16890023779572c657 2 parents 74e69c4 + 0c21bb9
@viktorklang viktorklang authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
View
8 akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
@@ -75,7 +75,9 @@ object AkkaKernelPlugin extends Plugin {
copyFiles(libFiles(cp, conf.libFilter), distLibPath)
copyFiles(conf.additionalLibs, distLibPath)
- for (subTarget subProjectDependencies.map(_.target)) {
+ for (subProjectDependency subProjectDependencies) {
+ val subTarget = subProjectDependency.target
+ EvaluateTask(buildStruct, packageBin in Compile, st, subProjectDependency.projectRef)
copyJars(subTarget, distLibPath)
}
log.info("Distribution created.")
@@ -220,10 +222,10 @@ object AkkaKernelPlugin extends Plugin {
}.toList
val target = setting(Keys.crossTarget, "Missing crossTarget directory")
- SubProjectInfo(project.id, target, subProjects)
+ SubProjectInfo(projectRef, target, subProjects)
}
- private case class SubProjectInfo(id: String, target: File, subProjects: Seq[SubProjectInfo]) {
+ private case class SubProjectInfo(projectRef: ProjectRef, target: File, subProjects: Seq[SubProjectInfo]) {
def recursiveSubProjects: Set[SubProjectInfo] = {
val flatSubProjects = for {

0 comments on commit ed64cdc

Please sign in to comment.
Something went wrong with that request. Please try again.