From 8f055d10fb3b5494115ffd8bf46b972d0937e234 Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Sun, 19 Mar 2017 21:38:02 -0400
Subject: Get rid of the hacky "essential" plugins separation Let’s keep move
 them back into stage2 again instead for reduction of complexity, cbt build
 speed and convenience of fewer manual dependencies. And for that let cbt just
 include eval from the start.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stage1/Stage1.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'stage1')

diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index e419e67..62cab87 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -91,8 +91,10 @@ object Stage1{
     import paths._
 
     val stage2sourceFiles = (
-      stage2.listFiles ++ (stage2 ++ "/plugins").listFiles
-    ).toVector.filter(_.isFile).filter(_.toString.endsWith(".scala"))
+      stage2.listFiles
+      ++ (stage2 / "plugins").listFiles
+      ++ (cbtHome / "libraries" / "eval").listFiles
+    ).filter(_.isFile).filter(_.toString.endsWith(".scala"))
 
     val cls = this.getClass.getClassLoader.loadClass("cbt.NailgunLauncher")
 
-- 
cgit v1.2.3