diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 09:48:03 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 09:48:03 -0400 |
| commit | d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1 (patch) | |
| tree | 5a7c36f38ba2f5af1080427cc9f37a45d5bed2ff /project/Build.scala | |
| parent | 3012bd9205636f0a4614d6dec65ffe5f86b719f6 (diff) | |
| parent | 31546d1b3d841a0fddc9c84af48361c74243ce8e (diff) | |
| download | scala-d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1.tar.gz scala-d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1.tar.bz2 scala-d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1.zip | |
Merge remote-tracking branch 'jsuereth/sbt-build' into sbt-build-0.11.3
Diffstat (limited to 'project/Build.scala')
| -rw-r--r-- | project/Build.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/project/Build.scala b/project/Build.scala index 25fb31cf5b..c753b4901f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -23,7 +23,7 @@ object ScalaBuild extends Build with Layers { lazy val buildFixed = AttributeKey[Boolean]("build-uri-fixed") // Build wide settings: - override lazy val settings = super.settings ++ Seq( + override lazy val settings = super.settings ++ Versions.settings ++ Seq( autoScalaLibrary := false, resolvers += Resolver.url( "Typesafe nightlies", @@ -34,7 +34,7 @@ object ScalaBuild extends Build with Layers { ScalaToolsSnapshots ), organization := "org.scala-lang", - version := "2.10.0-SNAPSHOT", + version <<= Versions.mavenVersion, pomExtra := <xml:group> <inceptionYear>2002</inceptionYear> <licenses> @@ -170,7 +170,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 |