From 21bbe06f35dad3cb0aa0d87a705d01a9b52ba644 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 19 Oct 2009 11:14:27 -0400 Subject: [PATCH] Set version to 0.6.0 --- project/build.properties | 4 ++-- project/build/SbtProject.scala | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/project/build.properties b/project/build.properties index 433d31217..55b9c6035 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,7 +1,7 @@ #Project properties -#Thu Oct 01 17:51:28 EDT 2009 +#Mon Oct 19 10:39:39 EDT 2009 project.organization=org.scala-tools.sbt project.name=Simple Build Tool sbt.version=0.5.5 -project.version=0.5.6-SNAPSHOT +project.version=0.6.0 scala.version=2.7.5 diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala index 77b689814..4bf40940b 100644 --- a/project/build/SbtProject.scala +++ b/project/build/SbtProject.scala @@ -7,14 +7,15 @@ import java.io.File class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.SbtScripted { - /** Additional resources to include in the produced jar.*/ + /* Additional resources to include in the produced jar.*/ def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE" override def mainResources = super.mainResources +++ extraResources - override def mainClass = Some("sbt.Main") - override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: "sbt.ProcessSpecification" :: Nil) :: super.testOptions.toList + + override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: Nil) :: super.testOptions.toList override def normalizedName = "sbt" //override def scriptedDependencies = testCompile :: `package` :: Nil + /* For Scala 2.8.0 nightlies, use a special resolver so that we can refer to a specific nightly and not just 2.8.0-SNAPSHOT*/ def specificSnapshotRepo = Resolver.url("scala-nightly") artifacts("http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]") mavenStyle() val nightlyScala = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", specificSnapshotRepo) @@ -35,7 +36,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt val optional = Configurations.Optional val provided = Configurations.Provided - /* The base configuration names for the versions of Scala*/ + /* Versions of Scala to cross-build against. */ private val Version2_7_2 = "2.7.2" private val Version2_7_3 = "2.7.3" private val Version2_7_4 = "2.7.4" @@ -52,8 +53,8 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional" // xsbt components - val xsbti = "org.scala-tools.sbt" % "launcher-interface" % "0.7.0_13" % "provided" - val compiler = "org.scala-tools.sbt" %% "compile" % "0.7.0_13" + val xsbti = "org.scala-tools.sbt" % "launcher-interface" % projectVersion.value.toString % "provided" + val compiler = "org.scala-tools.sbt" %% "compile" % projectVersion.value.toString override def libraryDependencies = super.libraryDependencies ++ getDependencies(scalaVersionString)