diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-19 21:38:02 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-19 21:38:02 -0400 |
commit | 8f055d10fb3b5494115ffd8bf46b972d0937e234 (patch) | |
tree | e0519bd38f618eaa91303076007383a8f3639484 /stage2/BasicBuild.scala | |
parent | ff4bc8f6d8077dd8d96064267c31bdace93d892b (diff) | |
download | cbt-8f055d10fb3b5494115ffd8bf46b972d0937e234.tar.gz cbt-8f055d10fb3b5494115ffd8bf46b972d0937e234.tar.bz2 cbt-8f055d10fb3b5494115ffd8bf46b972d0937e234.zip |
Get rid of the hacky "essential" plugins separation
Let’s keep move them back into stage2 again instead for reduction
of complexity, cbt build speed and convenience of fewer manual
dependencies.
And for that let cbt just include eval from the start.
Diffstat (limited to 'stage2/BasicBuild.scala')
-rw-r--r-- | stage2/BasicBuild.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 37b1786..491cdba 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -32,10 +32,10 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with SbtDep def projectDirectory: File = lib.realpath(context.workingDirectory) assert( projectDirectory.exists, "projectDirectory does not exist: " ++ projectDirectory.string ) assert( - projectDirectory.getName =!= lib.buildDirectoryName || - { + projectDirectory.getName =!= lib.buildDirectoryName + || { def transitiveInterfaces(cls: Class[_]): Vector[Class[_]] = cls.getInterfaces.toVector.flatMap(i => i +: transitiveInterfaces(i)) - transitiveInterfaces(this.getClass).contains(classOf[BuildBuildWithoutEssentials]) + transitiveInterfaces(this.getClass).contains(classOf[BuildBuild]) }, s"You need to extend ${lib.buildBuildClassName} in: " + projectDirectory + "/" ++ lib.buildDirectoryName ) |