diff options
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/BuildBuild.scala | 3 | ||||
| -rw-r--r-- | stage2/Plugin.scala | 3 | ||||
| -rw-r--r-- | stage2/plugins/DynamicOverrides.scala | 2 | ||||
| -rw-r--r-- | stage2/plugins/MultipleScalaVersions.scala | 4 |
4 files changed, 11 insertions, 1 deletions
diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala index 8430f49..299ec21 100644 --- a/stage2/BuildBuild.scala +++ b/stage2/BuildBuild.scala @@ -9,6 +9,9 @@ trait BuildBuild extends BaseBuild{ object plugins extends plugins( context, scalaVersion ) + /** CBT relies on hierarchical classloaders */ + final override def flatClassLoader = false + assert( projectDirectory.getName === lib.buildDirectoryName, s"You can't extend ${lib.buildBuildClassName} in: " + projectDirectory + "/" + lib.buildDirectoryName diff --git a/stage2/Plugin.scala b/stage2/Plugin.scala index 2cc242d..5faf80c 100644 --- a/stage2/Plugin.scala +++ b/stage2/Plugin.scala @@ -2,4 +2,7 @@ package cbt trait Plugin extends BaseBuild{ override def dependencies = super.dependencies :+ context.cbtDependency object plugins extends plugins( context, scalaVersion ) + + /** CBT relies on hierarchical classloaders */ + final override def flatClassLoader = false } diff --git a/stage2/plugins/DynamicOverrides.scala b/stage2/plugins/DynamicOverrides.scala index 8d67be7..b7c2832 100644 --- a/stage2/plugins/DynamicOverrides.scala +++ b/stage2/plugins/DynamicOverrides.scala @@ -48,6 +48,7 @@ trait DynamicOverrides extends BaseBuild{ ( baseName, s""" + import _root_.cbt._ class $baseName(context: _root_.cbt.Context) extends $parent(context)$mixin{ $body @@ -58,6 +59,7 @@ trait DynamicOverrides extends BaseBuild{ ( overrideName, s""" + import _root_.cbt._ class $baseName(context: _root_.cbt.Context) extends $parent(context)$mixin{ $body diff --git a/stage2/plugins/MultipleScalaVersions.scala b/stage2/plugins/MultipleScalaVersions.scala index 5d896dd..6bd5543 100644 --- a/stage2/plugins/MultipleScalaVersions.scala +++ b/stage2/plugins/MultipleScalaVersions.scala @@ -4,6 +4,8 @@ trait MultipleScalaVersions extends DynamicOverrides{ def scalaVersions: Seq[String] = Seq(scalaVersion, "2.10.6") def cross: Seq[MultipleScalaVersions] = scalaVersions.map{ v => - newBuild[MultipleScalaVersions](context.copy(scalaVersion = Some(v)))("") + newBuild[MultipleScalaVersions](context.copy(scalaVersion = Some(v)))(""" + override def sources = super.sources :+ ( projectDirectory / "src_" ++ scalaMajorVersion ) + """) } } |