From d4797818603d64153da51adb19ef34a96b32d858 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Mon, 27 Mar 2017 19:17:07 -0400 Subject: give access to version specific classes in cross-build --- stage2/plugins/DynamicOverrides.scala | 2 ++ stage2/plugins/MultipleScalaVersions.scala | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'stage2/plugins') 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 ) + """) } } -- cgit v1.2.3