diff options
| -rw-r--r-- | stage2/BuildBuild.scala | 12 | ||||
| -rw-r--r-- | stage2/BuildDependency.scala | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala index b230b01..91181d9 100644 --- a/stage2/BuildBuild.scala +++ b/stage2/BuildBuild.scala @@ -8,12 +8,12 @@ trait BuildBuild extends BaseBuild{ ) object plugins{ - final val scalaTest = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalatest" ) - final val sbtLayout = DirectoryDependency( managedContext.cbtHome ++ "/plugins/sbt_layout" ) - final val scalaJs = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalajs" ) - final val scalariform = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalariform" ) - final val scalafmt = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalafmt" ) - final val uberJar = DirectoryDependency( managedContext.cbtHome ++ "/plugins/uber-jar" ) + final lazy val scalaTest = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalatest" ) + final lazy val sbtLayout = DirectoryDependency( managedContext.cbtHome ++ "/plugins/sbt_layout" ) + final lazy val scalaJs = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalajs" ) + final lazy val scalariform = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalariform" ) + final lazy val scalafmt = DirectoryDependency( managedContext.cbtHome ++ "/plugins/scalafmt" ) + final lazy val uberJar = DirectoryDependency( managedContext.cbtHome ++ "/plugins/uber-jar" ) } override def dependencies = diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala index c0b53ad..a834435 100644 --- a/stage2/BuildDependency.scala +++ b/stage2/BuildDependency.scala @@ -15,16 +15,16 @@ trait TriggerLoop extends DependencyImplementation{ def triggerLoopFiles: Seq[File] } /** You likely want to use the factory method in the BasicBuild class instead of this. */ -case class DirectoryDependency(context: Context) extends TriggerLoop{ +final case class DirectoryDependency(context: Context) extends TriggerLoop{ override def show = this.getClass.getSimpleName ++ "(" ++ context.projectDirectory.string ++ ")" - final override lazy val logger = context.logger - final override lazy val lib: Lib = new Lib(logger) - private val root = lib.loadRoot( context.copy(args=Seq()) ) + lazy val logger = context.logger + override lazy val lib: Lib = new Lib(logger) + private lazy val root = lib.loadRoot( context.copy(args=Seq()) ) lazy val build = root.finalBuild def exportedClasspath = ClassPath() def dependencies = Seq(build) def triggerLoopFiles = root.triggerLoopFiles - override final val needsUpdate = build.needsUpdate + def needsUpdate = build.needsUpdate def targetClasspath = ClassPath() } /* |