diff options
| -rw-r--r-- | plugins/essentials/build/build.scala | 2 | ||||
| -rw-r--r-- | plugins/sbt_layout/SbtLayout.scala | 2 | ||||
| -rw-r--r-- | plugins/scalajs/ScalaJsBuild.scala | 1 | ||||
| -rw-r--r-- | plugins/sonatype-release/src/SonatypeRelease.scala | 1 | ||||
| -rw-r--r-- | stage2/BuildDependency.scala | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/plugins/essentials/build/build.scala b/plugins/essentials/build/build.scala index 91c3a0f..eef4921 100644 --- a/plugins/essentials/build/build.scala +++ b/plugins/essentials/build/build.scala @@ -1,4 +1,6 @@ import cbt._ +// TODO: maybe move this back into stage2 to avoid having to call zinc separately for this as a plugin +// and to avoid the special casing "BuildBuildWithoutEssentials" class Build(val context: Context) extends BaseBuild{ override def dependencies = ( super.dependencies diff --git a/plugins/sbt_layout/SbtLayout.scala b/plugins/sbt_layout/SbtLayout.scala index 5cd7a03..3e8706d 100644 --- a/plugins/sbt_layout/SbtLayout.scala +++ b/plugins/sbt_layout/SbtLayout.scala @@ -1,5 +1,5 @@ package cbt - +// TODO: move this into stage2 to avoid having to call zinc separately for this as a plugin trait SbtLayoutTest extends BaseBuild{ override def sources = Seq(projectDirectory ++ "/src/test/scala") override def compileTarget = super.compileTarget.getParentFile ++ "/test-classes" diff --git a/plugins/scalajs/ScalaJsBuild.scala b/plugins/scalajs/ScalaJsBuild.scala index 1b61b6e..b6df9e9 100644 --- a/plugins/scalajs/ScalaJsBuild.scala +++ b/plugins/scalajs/ScalaJsBuild.scala @@ -2,6 +2,7 @@ package cbt import java.io.File import java.net.URL +// TODO: maybe move this into stage2 to avoid having to call zinc separately for this as a plugin trait ScalaJsBuild extends DynamicOverrides{ final protected val scalaJsLib = ScalaJsLib( scalaJsVersion, scalaVersion, context.cbtLastModified, context.paths.mavenCache diff --git a/plugins/sonatype-release/src/SonatypeRelease.scala b/plugins/sonatype-release/src/SonatypeRelease.scala index 32303ad..cc2932a 100644 --- a/plugins/sonatype-release/src/SonatypeRelease.scala +++ b/plugins/sonatype-release/src/SonatypeRelease.scala @@ -1,4 +1,5 @@ package cbt +// TODO: maybe move this into stage2 to avoid having to call zinc separately for this as a plugin import cbt.sonatype.SonatypeLib diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala index 0162791..9a2918a 100644 --- a/stage2/BuildDependency.scala +++ b/stage2/BuildDependency.scala @@ -25,6 +25,7 @@ final case class DirectoryDependency(context: Context, pathToNestedBuild: String def transientCache = context.transientCache private lazy val root = lib.loadRoot( context ) lazy val dependency: Dependency = { + // TODO: move this into finalBuild probably def selectNestedBuild( build: Dependency, names: Seq[String], previous: Seq[String] ): Dependency = { names.headOption.map{ name => if( lib.taskNames(build.getClass).contains(name) ){ |