Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Aggregates add dependencies on agregatees.

  • Loading branch information...
commit fdd05a5e229ed905b45b5f35041ac1969b322d87 1 parent 2119ceb
@aemoncannon aemoncannon authored
Showing with 16 additions and 3 deletions.
  1. +1 −1  build.sbt
  2. +15 −2 src/main/scala/org/ensime/sbt/EnsimeCommand.scala
View
2  build.sbt
@@ -4,7 +4,7 @@ name := "ensime-sbt-cmd"
organization := "org.ensime"
-version := "0.0.9"
+version := "0.0.10"
//pgpSecretRing := file("/Users/aemon/.gnupg/secring.gpg")
View
17 src/main/scala/org/ensime/sbt/EnsimeCommand.scala
@@ -74,6 +74,7 @@ object EnsimeCommand {
val initX = Project extract state
+
val projs:List[KeyMap] = initX.structure.allProjects.map{
proj =>
@@ -95,7 +96,20 @@ object EnsimeCommand {
val projectVersion = optSetting(version)
val buildScalaVersion = optSetting(scalaVersion)
val modName = optSetting(moduleName)
- val modDeps = evaluateTask(projectDependencies).getOrElse(List()).map(_.name)
+
+ def projectRefModuleName(ref:ProjectRef):Option[String] = {
+ implicit val x = Extracted(initX.structure, initX.session, ref)
+ implicit val buildStruct = x.structure
+ optSetting(moduleName)
+ }
+ val modDeps = {
+
+ // Dependencies include direct, declared dependencies:
+ evaluateTask(projectDependencies).getOrElse(List()).map(_.name) ++
+
+ // And subprojects of an aggregate:
+ proj.aggregate.flatMap(projectRefModuleName)
+ }
val compileDeps = (
taskFiles(unmanagedClasspath in Compile) ++
@@ -155,4 +169,3 @@ object EnsimeCommand {
}
}
}
-
Please sign in to comment.
Something went wrong with that request. Please try again.