luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

post-release bumps and changes

This commit is contained in:
Mark Harrah 2010-05-16 21:33:27 -04:00
parent ad9cd40f9f
commit 5e8e72a965
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/build.properties
View File

@ -1,5 +1,5 @@
project.organization=org.scala-tools.sbt project.organization=org.scala-tools.sbt
project.name=xsbt project.name=xsbt
sbt.version=0.7.3 sbt.version=0.7.4
project.version=0.7.4 project.version=0.7.5-SNAPSHOT
build.scala.versions=2.7.7 build.scala.versions=2.7.7

6
project/build/SbtProject.scala
View File

@ -6,7 +6,7 @@ import sbt._
import java.io.File import java.io.File
import java.net.URL import java.net.URL
abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted with posterous.Publish// with Sxr abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted with posterous.Publish with Sxr
{ {
/* Additional resources to include in the produced jar.*/ /* Additional resources to include in the produced jar.*/
def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE" def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
@ -26,7 +26,7 @@ abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with t
// The output of scripted tasks executed in parallel will be inteleaved if false. // 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 // Configure which versions of Scala to test against for those tests that do cross building
override def scriptedCompatibility = sbt.test.CompatibilityLevel.Minimal override def scriptedBuildVersions = "2.7.7 2.7.5 2.7.2 2.8.0.RC2 2.8.0.Beta1"
override def useDefaultConfigurations = false override def useDefaultConfigurations = false
val default = Configurations.Default val default = Configurations.Default
@ -58,7 +58,7 @@ abstract class SbtProject(info: ProjectInfo) extends DefaultProject(info) with t
lazy val sbtDoc = packageTask(mainDocPath ##, packageDocsJar, Recursive) dependsOn(sbtGenDoc) lazy val sbtDoc = packageTask(mainDocPath ##, packageDocsJar, Recursive) dependsOn(sbtGenDoc)
lazy val sbtSrc = packageTask(deepSources, packageSrcJar, packageOptions) dependsOn(compile) lazy val sbtSrc = packageTask(deepSources, packageSrcJar, packageOptions) dependsOn(compile)
override def packageToPublishActions = super.packageToPublishActions //++ Seq(sbtSrc, sbtDoc) //sxr override def packageToPublishActions = super.packageToPublishActions //++ Seq(sbtSrc, sbtDoc, sxr)
override def packageDocsJar = defaultJarPath("-javadoc.jar") override def packageDocsJar = defaultJarPath("-javadoc.jar")
override def packageSrcJar= defaultJarPath("-sources.jar") override def packageSrcJar= defaultJarPath("-sources.jar")

5
project/build/Sxr.scala
View File

@ -17,9 +17,8 @@ trait Sxr extends BasicScalaProject
lazy val sxr = task { lazy val sxr = task {
xsbt.FileUtilities.delete(sxrOutput +++ sxrClassesOutput getFiles) xsbt.FileUtilities.delete(sxrOutput +++ sxrClassesOutput getFiles)
xsbt.FileUtilities.createDirectory(sxrClassesOutput asFile) xsbt.FileUtilities.createDirectory(sxrClassesOutput asFile)
val compiler = new xsbt.RawCompiler(buildScalaInstance, true, true, log) val compiler = new xsbt.RawCompiler(buildScalaInstance, xsbt.ClasspathOptions.auto, log)
// `Set() ++` is temporary. getFiles returns immutable.Set in sbt 0.7.3. compiler(deepSources.getFiles, compileClasspath.getFiles, sxrClassesOutput asFile, sxrOptions)
compiler(Set() ++ deepSources.getFiles, Set() ++ compileClasspath.getFiles, sxrClassesOutput asFile, sxrOptions)
None None
} }
} }

2
project/plugins/Plugins.scala
View File

@ -4,7 +4,7 @@ import java.net.URL
class Plugins(info: ProjectInfo) extends PluginDefinition(info) class Plugins(info: ProjectInfo) extends PluginDefinition(info)
{ {
val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0" val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.4"
val t_repo = "t_repo" at "http://tristanhunt.com:8081/content/groups/public/" val t_repo = "t_repo" at "http://tristanhunt.com:8081/content/groups/public/"
val posterous = "net.databinder" % "posterous-sbt" % "0.1.4" val posterous = "net.databinder" % "posterous-sbt" % "0.1.4"
val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns) val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)

1
sbt/install/project/build.properties
View File

@ -1 +0,0 @@
project.version=0.3.1