diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-22 08:51:22 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-22 08:51:22 -0400 |
| commit | 8545ade2ae70213074eb4341442980838596673f (patch) | |
| tree | 4cbd05aa684db542c5cad00f030f6d82b9143ed4 /project | |
| parent | 1f5584fbe183041d4af269278f0125e2f0b94a44 (diff) | |
| download | scala-8545ade2ae70213074eb4341442980838596673f.tar.gz scala-8545ade2ae70213074eb4341442980838596673f.tar.bz2 scala-8545ade2ae70213074eb4341442980838596673f.zip | |
Fixed issue where forkjoin analysis bombed with incompatible class change exception.
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala index ea0e84f0cc..d3be8cd810 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -156,6 +156,8 @@ object ScalaBuild extends Build with Layers { def settingOverrides: Seq[Setting[_]] = publishSettings ++ Seq( crossPaths := false, autoScalaLibrary := false, + // Work around a bug where scala-library (and forkjoin) is put on classpath for analysis. + classpathOptions := ClasspathOptions.manual, publishArtifact in packageDoc := false, publishArtifact in packageSrc := false, target <<= (baseDirectory, name) apply (_ / "target" / _), @@ -168,8 +170,8 @@ object ScalaBuild extends Build with Layers { // Most libs in the compiler use this order to build. compileOrder in Compile := CompileOrder.JavaThenScala, lockFile <<= target(_ / "compile.lock"), - skip in Compile <<= lockFile.map(_ exists), - lock <<= lockFile map { f => IO.touch(f) }, + skip in Compile <<= lockFile map (_.exists), + lock <<= lockFile map (f => IO.touch(f)), unlock <<= lockFile map IO.delete ) |