Merge pull request #303 from cvogt/nested-builds

Add support for nested builds and use it to replace cross compilation command which was previously hard-coded

1 files changed, 3 insertions, 3 deletions

diff --git a/stage1/cbt.scala b/stage1/cbt.scala
index 8520be4..a1776b1 100644
--- a/stage1/cbt.scala
+++ b/stage1/cbt.scala
@@ -44,7 +44,6 @@ object `package`{
     // then we wouldn't need this and could provide this method from a 
     // plugin rather than hard-coding trigger files stuff in cbt
     def triggerLoopFiles: Seq[File] = triggerLoopFilesArray.to
-    def crossScalaVersions: Seq[String] = crossScalaVersionsArray.to
   }
   implicit class ArtifactInfoExtensions(subject: ArtifactInfo){
     import subject._
@@ -53,9 +52,10 @@ object `package`{
   }
   implicit class DependencyExtensions(subject: Dependency){
     import subject._
-    def dependencyClasspath: ClassPath = ClassPath(dependencyClasspathArray.to)
+    def dependencyClasspath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]): ClassPath
+      = Dependencies(dependenciesArray.to).classpath
     def exportedClasspath: ClassPath = ClassPath(exportedClasspathArray.to)
-    def classpath = exportedClasspath ++ dependencyClasspath
+    def classpath(implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef]) = exportedClasspath ++ dependencyClasspath
     def dependencies: Seq[Dependency] = dependenciesArray.to
   }
   implicit class ContextExtensions(subject: Context){