Fix building cbt as a cbt project

3 files changed, 10 insertions, 5 deletions

diff --git a/stage2/AdminTasks.scala b/stage2/AdminTasks.scala
index 9086470..56d6ddf 100644
--- a/stage2/AdminTasks.scala
+++ b/stage2/AdminTasks.scala
@@ -11,7 +11,7 @@ class AdminTasks(
   cbtHome: File,
   cbtHasChanged: Boolean
 ){
-  private val paths = Paths(cbtHome, cache)
+  private val paths = CbtPaths(cbtHome, cache)
   import paths._
   private val mavenCentral = MavenResolver(cbtHasChanged,mavenCache,MavenResolver.central)
   implicit val logger: Logger = lib.logger
diff --git a/stage2/Scaffold.scala b/stage2/Scaffold.scala
index 7806b8c..407fee1 100644
--- a/stage2/Scaffold.scala
+++ b/stage2/Scaffold.scala
@@ -22,9 +22,14 @@ import java.io.File
 import scala.collection.immutable.Seq
 
 class Build(context: Context) extends BasicBuild(context){
-  override def dependencies = super.dependencies ++ Seq(  // don't forget super.dependencies here
-    // "org.cvogt" %% "scala-extensions" % "0.4.1"
-  )
+  override def dependencies = {  // don't forget super.dependencies here
+    super.dependencies :+ MavenResolver(context.cbtHasChanged,context.paths.mavenCache,MavenResolver.central).resolve(
+      MavenDependency("net.incongru.watchservice","barbary-watchservice","1.0"),
+      MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"),
+      MavenDependency("com.typesafe.zinc","zinc","0.3.9"),
+      ScalaDependency("org.scala-lang.modules","scala-xml","1.0.5")
+    )
+  }
 }
 """
     )
diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala
index 5316e78..9639380 100644
--- a/stage2/Stage2.scala
+++ b/stage2/Stage2.scala
@@ -19,7 +19,7 @@ object Stage2 extends Stage2Base{
 
   def run( args: Stage2Args ): Unit = {
     import args.logger
-    val paths = Paths(args.cbtHome,args.cache)
+    val paths = CbtPaths(args.cbtHome,args.cache)
     import paths._
     val lib = new Lib(args.logger)