diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-04-03 11:36:07 -0400 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-04-03 11:36:07 -0400 |
commit | 4467438a58a3ce0342c1ab608b02b0f880c61aaf (patch) | |
tree | 24fbaa747309b4ea7eba029b9ccfafc62cd986ad /project/Build.scala | |
parent | 9894b2c9bcfe9cec0a6853b69148e0c8b5a2508d (diff) | |
download | scala-4467438a58a3ce0342c1ab608b02b0f880c61aaf.tar.gz scala-4467438a58a3ce0342c1ab608b02b0f880c61aaf.tar.bz2 scala-4467438a58a3ce0342c1ab608b02b0f880c61aaf.zip |
Fixed up versioning scheme.
SBT build should now mimic ant build for versions.
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 dd9f9f6c04..76df76d38c 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> @@ -111,7 +111,7 @@ object ScalaBuild extends Build with Layers { ) // Settings for root project. These are aggregate tasks against the rest of the build. - def projectSettings: Seq[Setting[_]] = publishSettings ++ Versions.settings ++ Seq( + def projectSettings: Seq[Setting[_]] = publishSettings ++ Seq( doc in Compile <<= (doc in documentation in Compile).identity, // These next two aggregate commands on several projects and return results that are to be ignored by remaining tasks. compile in Compile <<= compiledProjects.map(p => compile in p in Compile).join.map(_.head), |