diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-02 04:02:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 04:02:30 -0400 |
| commit | 5d4660e9263e1da005f02a78ee0b027d1d3846be (patch) | |
| tree | aa99905c6399aee8c935d2d00864d7e58ce3b6f0 /stage2/plugins | |
| parent | 2476e2ec1100813ae4e05cf2183feff8bf5ec8ea (diff) | |
| parent | d4797818603d64153da51adb19ef34a96b32d858 (diff) | |
| download | cbt-5d4660e9263e1da005f02a78ee0b027d1d3846be.tar.gz cbt-5d4660e9263e1da005f02a78ee0b027d1d3846be.tar.bz2 cbt-5d4660e9263e1da005f02a78ee0b027d1d3846be.zip | |
Merge pull request #465 from cvogt/verify-classpath
Verify classpath
Diffstat (limited to 'stage2/plugins')
| -rw-r--r-- | stage2/plugins/DynamicOverrides.scala | 2 | ||||
| -rw-r--r-- | stage2/plugins/MultipleScalaVersions.scala | 4 |
2 files changed, 5 insertions, 1 deletions
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 ) + """) } } |