simplify: get output dir from srcEntries rather than srcDirectories

sbt · Nov 16, 2017 · b4d909c · b4d909c
1 parent 03fb0e9
commit b4d909c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/src/main/scala-sbt-0.13/com/typesafe/sbteclipse/core/Eclipse.scala b/src/main/scala-sbt-0.13/com/typesafe/sbteclipse/core/Eclipse.scala
@@ -305,16 +305,11 @@ private object Eclipse extends EclipseSDTConfig {
       srcEntries <- srcEntriesIoSeq.toList.sequence;
       linkEntries <- srcLinkEntriesIoSeq.toList.sequence
     ) yield {
-      val eclipseOutputDirs: Seq[String] = for {
-        (fa: File, ta: Option[File]) <- srcDirectories
-        eclipseOutputPath = ta match {
-          case Some(dd) => relativize(baseDirectory, dd).toString
-          case None => ""
-        }
-      } yield eclipseOutputPath
-      val classDirectory = eclipseOutputDirs.filter { _.nonEmpty }.distinct match {
-        case dir :: _ => dir
-        case _ => "bin" // this is the eclipse default
+      def classDirectory = srcEntries.flatMap { _.output }.distinct match {
+        case Nil =>
+          "bin"
+        case dir :: _ =>
+          dir
       }
       val entries = srcEntries ++ linkEntries ++
         (projectDependencies map EclipseClasspathEntry.Project) ++

diff --git a/src/main/scala-sbt-1.0/com/typesafe/sbteclipse/core/Eclipse.scala b/src/main/scala-sbt-1.0/com/typesafe/sbteclipse/core/Eclipse.scala
@@ -305,16 +305,11 @@ private object Eclipse extends EclipseSDTConfig {
       srcEntries <- srcEntriesIoSeq.toList.sequence;
       linkEntries <- srcLinkEntriesIoSeq.toList.sequence
     ) yield {
-      val eclipseOutputDirs: Seq[String] = for {
-        (fa: File, ta: Option[File]) <- srcDirectories
-        eclipseOutputPath = ta match {
-          case Some(dd) => relativize(baseDirectory, dd).toString
-          case None => ""
-        }
-      } yield eclipseOutputPath
-      val classDirectory = eclipseOutputDirs.filter { _.nonEmpty }.distinct match {
-        case dir :: _ => dir
-        case _ => "bin" // this is the eclipse default
+      def classDirectory = srcEntries.flatMap { _.output }.distinct match {
+        case Nil =>
+          "bin"
+        case dir :: _ =>
+          dir
       }
       val entries = srcEntries ++ linkEntries ++
         (projectDependencies map EclipseClasspathEntry.Project) ++