From ad2094b06eb7e313b3655ae0cae98b50787177d3 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Tue, 7 Jun 2016 11:07:09 -0400 Subject: separate sbt layout and scalatest plugins and create a more general plugin architecture --- stage2/BuildBuild.scala | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'stage2/BuildBuild.scala') diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala index 8ac619c..7eab5e6 100644 --- a/stage2/BuildBuild.scala +++ b/stage2/BuildBuild.scala @@ -1,18 +1,23 @@ package cbt -import java.io._ import java.nio.file._ trait BuildBuild extends BaseBuild{ + private final val managedContext = context.copy( + projectDirectory = managedBuildDirectory, + parentBuild=Some(this) + ) + + object plugins{ + final val scalaTest = BuildDependency( managedContext.cbtHome ++ "/plugins/scalatest" ) + final val sbtLayout = BuildDependency( managedContext.cbtHome ++ "/plugins/sbt_layout" ) + } + override def dependencies = super.dependencies :+ context.cbtDependency - def managedBuildDirectory: File = lib.realpath( projectDirectory.parent ) + def managedBuildDirectory: java.io.File = lib.realpath( projectDirectory.parent ) private object managedBuildCache extends Cache[BuildInterface] def managedBuild = managedBuildCache{ try{ - val managedContext = context.copy( - projectDirectory = managedBuildDirectory, - parentBuild=Some(this) - ) val managedBuildFile = projectDirectory++"/build.scala" logger.composition("Loading build at "++managedContext.projectDirectory.toString) ( -- cgit v1.2.3