diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 10:13:40 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 10:13:40 -0400 |
| commit | ed9fc68716b47de626c3f1f0b5fa1d86a2068498 (patch) | |
| tree | bbb7096435c640b72eaf6ec6dcfe0acf76f76dff /stage2 | |
| parent | 72bf7175808d40fb962ef1df77e14e777ef54548 (diff) | |
| download | cbt-ed9fc68716b47de626c3f1f0b5fa1d86a2068498.tar.gz cbt-ed9fc68716b47de626c3f1f0b5fa1d86a2068498.tar.bz2 cbt-ed9fc68716b47de626c3f1f0b5fa1d86a2068498.zip | |
include dependencyClasspath in compileClasspath and let docs use it too
this prevents from forgetting the dependencyClasspath when compileClasspath
is used and probably fixes the cp for docs
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/BasicBuild.scala | 5 | ||||
| -rw-r--r-- | stage2/PackageJars.scala | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index b2bb72b..6d1f010 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -104,7 +104,8 @@ trait BaseBuild extends DependencyImplementation with BuildInterface with Trigge override def dependencyClasspath : ClassPath = ClassPath(localJars) ++ super.dependencyClasspath protected def compileDependencies: Seq[Dependency] = Nil - final def compileClasspath : ClassPath = ClassPath( compileDependencies.flatMap(_.exportedClasspath.files).distinct ) + final def compileClasspath : ClassPath = + dependencyClasspath ++ ClassPath( compileDependencies.flatMap(_.exportedClasspath.files).distinct ) def exportedClasspath : ClassPath = ClassPath(compile.toSeq) def targetClasspath = ClassPath(Seq(compileTarget)) @@ -129,7 +130,7 @@ trait BaseBuild extends DependencyImplementation with BuildInterface with Trigge lib.compile( context.cbtHasChanged, needsUpdate || context.parentBuild.map(_.needsUpdate).getOrElse(false), - sourceFiles, compileTarget, compileStatusFile, dependencyClasspath ++ compileClasspath, + sourceFiles, compileTarget, compileStatusFile, compileClasspath, context.paths.mavenCache, scalacOptions, context.classLoaderCache, zincVersion = zincVersion, scalaVersion = scalaVersion ) diff --git a/stage2/PackageJars.scala b/stage2/PackageJars.scala index 05e625b..10e4c3a 100644 --- a/stage2/PackageJars.scala +++ b/stage2/PackageJars.scala @@ -24,7 +24,7 @@ trait PackageJars extends BaseBuild with ArtifactInfo{ def docJar: Option[File] = cacheDocBasicBuild{ lib.docJar( context.cbtHasChanged, - scalaVersion, sourceFiles, dependencyClasspath, apiTarget, + scalaVersion, sourceFiles, compileClasspath, docTarget, jarTarget, artifactId, scalaMajorVersion, version, scalacOptions, context.classLoaderCache, context.paths.mavenCache ) |