diff --git a/project/build.properties b/project/build.properties index c3fcade05..83378f0db 100644 --- a/project/build.properties +++ b/project/build.properties @@ -3,5 +3,5 @@ project.organization=org.scala-tools.sbt project.name=Simple Build Tool sbt.version=0.5.6 -project.version=0.6.6 +project.version=0.6.7 scala.version=2.7.7 diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala index cecba01f9..c5506e9c5 100644 --- a/project/build/SbtProject.scala +++ b/project/build/SbtProject.scala @@ -20,7 +20,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns) override def compileOptions = Nil - + /** configuration of scripted testing **/ // Set to false to show logging as it happens without buffering, true to buffer until it completes and only show if the task fails. // The output of scripted tasks executed in parallel will be inteleaved if true. @@ -43,12 +43,12 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc val provided = Configurations.Provided /* Versions of Scala to cross-build against. */ - private val Version2_7_5 = "2.7.5" - private val Version2_8_0 = "2.8.0-20090929.004247-+" + private val Version2_7_7 = "2.7.7" + private val Version2_8_0 = "2.8.0-SNAPSHOT" // the list of all supported versions - private def allVersions = Version2_7_5 :: Version2_8_0 :: Nil + private def allVersions = Version2_7_7 :: Version2_8_0 :: Nil - override def crossScalaVersions = Set(Version2_7_5) + override def crossScalaVersions = Set(Version2_7_7) //testing val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6" diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala index d3cdcc43b..a21f23274 100644 --- a/project/plugins/Plugins.scala +++ b/project/plugins/Plugins.scala @@ -4,6 +4,6 @@ import java.net.URL class Plugins(info: ProjectInfo) extends PluginDefinition(info) { - val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.6" + val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.7" val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns) } diff --git a/scripted/project/build.properties b/scripted/project/build.properties index fb0ede1fa..67ee86e12 100644 --- a/scripted/project/build.properties +++ b/scripted/project/build.properties @@ -1,8 +1,6 @@ -#Project properties -#Sat Aug 01 10:32:20 EDT 2009 project.organization=org.scala-tools.sbt project.name=scripted sbt.version=0.5.6 -project.version=0.6.6 +project.version=0.6.7 scala.version=2.7.7 project.initialize=false diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala index 802c1afd0..0f6519a3e 100644 --- a/src/main/scala/sbt/Conditional.scala +++ b/src/main/scala/sbt/Conditional.scala @@ -374,8 +374,8 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati { if(jars.size > 1) { - log.warn("Possible duplicate classpath locations for jar " + name + ": ") - for(jar <- jars) log.warn("\t" + jar.absolutePath) + log.debug("Possible duplicate classpath locations for jar " + name + ": ") + for(jar <- jars) log.debug("\t" + jar.absolutePath) } } }