From 8f055d10fb3b5494115ffd8bf46b972d0937e234 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sun, 19 Mar 2017 21:38:02 -0400 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stage2/BasicBuild.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'stage2/BasicBuild.scala') 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 ) -- cgit v1.2.3