diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 10:37:59 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 10:37:59 -0400 |
| commit | b84cbda870b81f51af7928002073a67ac89558e1 (patch) | |
| tree | ded67903cc493f8fbc5e0619e0151473797185e9 /project/Build.scala | |
| parent | d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1 (diff) | |
| download | scala-b84cbda870b81f51af7928002073a67ac89558e1.tar.gz scala-b84cbda870b81f51af7928002073a67ac89558e1.tar.bz2 scala-b84cbda870b81f51af7928002073a67ac89558e1.zip | |
Everything now builds. Partest is bombing about reflection issue.
Diffstat (limited to 'project/Build.scala')
| -rw-r--r-- | project/Build.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/project/Build.scala b/project/Build.scala index c753b4901f..ea0e84f0cc 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -148,13 +148,14 @@ object ScalaBuild extends Build with Layers { lazy val externalDeps: Setting[_] = libraryDependencies <<= (sbtVersion)(v => Seq( "org.apache.ant" % "ant" % "1.8.2", - "org.scala-tools.sbt" % "compiler-interface" % v % "provided" + "org.scala-sbt" % "compiler-interface" % v % "provided" ) ) // These are setting overrides for most artifacts in the Scala build file. def settingOverrides: Seq[Setting[_]] = publishSettings ++ Seq( crossPaths := false, + autoScalaLibrary := false, publishArtifact in packageDoc := false, publishArtifact in packageSrc := false, target <<= (baseDirectory, name) apply (_ / "target" / _), @@ -170,7 +171,7 @@ object ScalaBuild extends Build with Layers { skip in Compile <<= lockFile.map(_ exists), lock <<= lockFile map { f => IO.touch(f) }, unlock <<= lockFile map IO.delete - ) ++ CheatingCompilerSettings.settings + ) // -------------------------------------------------------------- // Libraries used by Scalac that change infrequently @@ -327,7 +328,7 @@ object ScalaBuild extends Build with Layers { // Testing // -------------------------------------------------------------- /* lazy val scalacheckSettings: Seq[Setting[_]] = Seq(fullQuickScalaReference, crossPaths := false)*/ - lazy val scalacheck = uri("git://github.com/rickynils/scalacheck.git") + lazy val scalacheck = uri("git://github.com/jsuereth/scalacheck.git#scala-build") lazy val testsuiteSettings: Seq[Setting[_]] = compilerDependentProjectSettings ++ partestTaskSettings ++ VerifyClassLoad.settings ++ Seq( unmanagedBase <<= baseDirectory / "test/files/lib", @@ -518,7 +519,7 @@ object ScalaBuild extends Build with Layers { // Add in some more dependencies makeDistMappings <<= (makeDistMappings, packageBin in swing in Compile) map { - (dist, s, d) => + (dist, s) => dist ++ Seq(s -> "lib/scala-swing.jar") }, makeDist <<= (makeDistMappings, baseDirectory, streams) map { (maps, dir, s) => |