diff --git a/install/project/build.properties b/install/project/build.properties index 7e95b7a58..53b14ff63 100644 --- a/install/project/build.properties +++ b/install/project/build.properties @@ -1,6 +1,6 @@ project.name=extract project.organization=org.scala-tools.sbt project.version=0.3.0 -sbt.version=0.6.13 +sbt.version=0.7.0 def.scala.version=2.7.7 build.scala.versions=2.7.7 diff --git a/project/build.properties b/project/build.properties index 48c7f1db5..55844cc15 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,6 +1,6 @@ project.name=Simple Build Tool project.organization=org.scala-tools.sbt -project.version=0.7.0 -sbt.version=0.6.13 +project.version=0.7.1-SNAPSHOT +sbt.version=0.7.0 def.scala.version=2.7.7 build.scala.versions=2.7.7 diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala index 2487b5a3f..1b2189e5c 100644 --- a/project/build/SbtProject.scala +++ b/project/build/SbtProject.scala @@ -6,7 +6,7 @@ import sbt._ import java.io.File import java.net.URL -class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.SbtScripted with posterous.Publish +class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted //with posterous.Publish { /* Additional resources to include in the produced jar.*/ def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE" @@ -24,9 +24,9 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt /** 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 false. - //override def scriptedBufferLog = true + override def scriptedBufferLog = true // Configure which versions of Scala to test against for those tests that do cross building - //override def scriptedCompatibility = sbt.test.CompatibilityLevel.Minimal + override def scriptedCompatibility = sbt.test.CompatibilityLevel.Minimal override def useDefaultConfigurations = false val default = Configurations.Default diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala index 5d67a4b0d..dc50f8a8c 100644 --- a/project/plugins/Plugins.scala +++ b/project/plugins/Plugins.scala @@ -4,7 +4,7 @@ import java.net.URL class Plugins(info: ProjectInfo) extends PluginDefinition(info) { -// val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0-SNAPSHOT" + val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0" // val posterous = "net.databinder" % "posterous-sbt" % "0.1.0-SNAPSHOT" 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 d2c0f2559..1ffc2e543 100644 --- a/scripted/project/build.properties +++ b/scripted/project/build.properties @@ -1,6 +1,6 @@ project.name=scripted project.organization=org.scala-tools.sbt -project.version=0.7.0 +project.version=0.7.1-SNAPSHOT sbt.version=0.7.0 def.scala.version=2.7.7 build.scala.versions=2.7.7