Skip to content
This repository
Browse code

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
Viktor Klang (√) authored June 18, 2012
8  akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
@@ -75,7 +75,9 @@ object AkkaKernelPlugin extends Plugin {
75 75
 
76 76
         copyFiles(libFiles(cp, conf.libFilter), distLibPath)
77 77
         copyFiles(conf.additionalLibs, distLibPath)
78  
-        for (subTarget ← subProjectDependencies.map(_.target)) {
  78
+        for (subProjectDependency ← subProjectDependencies) {
  79
+          val subTarget = subProjectDependency.target
  80
+          EvaluateTask(buildStruct, packageBin in Compile, st, subProjectDependency.projectRef)
79 81
           copyJars(subTarget, distLibPath)
80 82
         }
81 83
         log.info("Distribution created.")
@@ -220,10 +222,10 @@ object AkkaKernelPlugin extends Plugin {
220 222
     }.toList
221 223
 
222 224
     val target = setting(Keys.crossTarget, "Missing crossTarget directory")
223  
-    SubProjectInfo(project.id, target, subProjects)
  225
+    SubProjectInfo(projectRef, target, subProjects)
224 226
   }
225 227
 
226  
-  private case class SubProjectInfo(id: String, target: File, subProjects: Seq[SubProjectInfo]) {
  228
+  private case class SubProjectInfo(projectRef: ProjectRef, target: File, subProjects: Seq[SubProjectInfo]) {
227 229
 
228 230
     def recursiveSubProjects: Set[SubProjectInfo] = {
229 231
       val flatSubProjects = for {

0 notes on commit ed64cdc

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