diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-30 10:47:28 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-30 11:03:55 -0400 |
| commit | 3446af59a17bdef8730008a61eade7937b9cda56 (patch) | |
| tree | c3785086e3a9985abde78477a3b4bd997b512273 /stage2/DirectoryDependency.scala | |
| parent | 249b4a04bac50fcb9510e71ad142fcabf7b7f61d (diff) | |
| download | cbt-3446af59a17bdef8730008a61eade7937b9cda56.tar.gz cbt-3446af59a17bdef8730008a61eade7937b9cda56.tar.bz2 cbt-3446af59a17bdef8730008a61eade7937b9cda56.zip | |
scalatest plugin for 2.12 (and move most code from plugin into library)
Diffstat (limited to 'stage2/DirectoryDependency.scala')
| -rw-r--r-- | stage2/DirectoryDependency.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/stage2/DirectoryDependency.scala b/stage2/DirectoryDependency.scala index 6ebb988..f2b5557 100644 --- a/stage2/DirectoryDependency.scala +++ b/stage2/DirectoryDependency.scala @@ -57,7 +57,9 @@ object DirectoryDependency { // the beginning. Instead CBT always needs to build the pure Java // Launcher in the checkout with itself and then run it via reflection. val ( checkoutDirectory, dependency ) = - GitDependency.withCheckoutDirectory( base, hash, Some( "nailgun_launcher" ) )( context ) + GitDependency.withCheckoutDirectory( base, hash, Some( "nailgun_launcher" ) )( + context.copy( scalaVersion = None ) + ) dependency .dependency .asInstanceOf[BaseBuild] // should work because nailgun_launcher/ has no cbt build of it's own @@ -71,7 +73,9 @@ object DirectoryDependency { def loadCustomBuild: AnyRef = { lib.logger.composition( "Loading build at " ++ buildDirectory.string ) - val buildBuild = apply( buildDirectory, None )( context ).dependency.asInstanceOf[BuildInterface] + val buildBuild = apply( + context.copy( workingDirectory = buildDirectory, scalaVersion = None ), None + ).dependency.asInstanceOf[BuildInterface] import buildBuild._ val managedContext = context.copy( parentBuild = Some( buildBuild ) ) |