diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-13 16:02:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-13 16:02:38 +0100 |
commit | 85d2ae617c6b475537ab657d8c3b361f051f0539 (patch) | |
tree | 1936886a5ae86646142647d1af81df07ba80328c /stage2 | |
parent | 1dcb71c9584f8dd84f4e6dfa4bcc69ef3a4810de (diff) | |
parent | 6a770ac9cf0ed7c8157c7222e74ed1527d4c76c2 (diff) | |
download | cbt-85d2ae617c6b475537ab657d8c3b361f051f0539.tar.gz cbt-85d2ae617c6b475537ab657d8c3b361f051f0539.tar.bz2 cbt-85d2ae617c6b475537ab657d8c3b361f051f0539.zip |
Merge pull request #222 from cvogt/minor-fixes
Minor fixes
Diffstat (limited to 'stage2')
-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() } /* |