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

Upgrade to sbt 0.13.1

This commit is contained in:
Josh Suereth 2014-01-06 09:30:02 -05:00
parent 089a0efbca
commit 5994a7bec5
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=0.12.4-RC1 sbt.version=0.13.1

15
project/packaging.scala
View File

@ -9,8 +9,6 @@ object Packaging {
val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location") val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location")
val sbtLaunchJar = TaskKey[File]("sbt-launch-jar", "Resolves SBT launch jar") val sbtLaunchJar = TaskKey[File]("sbt-launch-jar", "Resolves SBT launch jar")
val moduleID = (organization, sbtVersion) apply { (o,v) => ModuleID(o,"sbt",v) } val moduleID = (organization, sbtVersion) apply { (o,v) => ModuleID(o,"sbt",v) }
val stagingDirectory = SettingKey[File]("staging-directory")
val stage = TaskKey[File]("stage")
def localWindowsPattern = "[organisation]/[module]/[revision]/[module].[ext]" def localWindowsPattern = "[organisation]/[module]/[revision]/[module].[ext]"
@ -23,11 +21,11 @@ object Packaging {
case _ => "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/"+v+"/sbt-launch.jar" case _ => "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/"+v+"/sbt-launch.jar"
} }
val settings: Seq[Setting[_]] = packagerSettings ++ deploymentSettings ++ mapGenericFilesToLinux ++ mapGenericFilesToWinows ++ Seq( val settings: Seq[Setting[_]] = packagerSettings ++ deploymentSettings ++ mapGenericFilesToLinux ++ mapGenericFilesToWindows ++ Seq(
sbtLaunchJarUrl <<= sbtVersion apply downloadUrlForVersion, sbtLaunchJarUrl <<= sbtVersion apply downloadUrlForVersion,
sbtLaunchJarLocation <<= target apply (_ / "sbt-launch.jar"), sbtLaunchJarLocation <<= target apply (_ / "sbt-launch.jar"),
sbtLaunchJar <<= (sbtLaunchJarUrl, sbtLaunchJarLocation) map { (uri, file) => sbtLaunchJar <<= (sbtLaunchJarUrl, sbtLaunchJarLocation) map { (uri, file) =>
import dispatch._ import dispatch.classic._
if(!file.exists) { if(!file.exists) {
// oddly, some places require us to create the file before writing... // oddly, some places require us to create the file before writing...
IO.touch(file) IO.touch(file)
@ -98,13 +96,6 @@ object Packaging {
projectID in Debian <<= moduleID, projectID in Debian <<= moduleID,
projectID in Windows <<= moduleID, projectID in Windows <<= moduleID,
projectID in Rpm <<= moduleID, projectID in Rpm <<= moduleID,
projectID in Universal <<= moduleID, projectID in Universal <<= moduleID
stagingDirectory <<= (target) apply { (t) => t / "stage" },
stage <<= (stagingDirectory, mappings in Universal) map { (dir, m) =>
val files = for((file, name) <- m)
yield file -> (dir / name)
IO copy files
dir
}
) )
} }

4
project/project/plugins.scala
View File

@ -6,8 +6,8 @@ object PluginBuild extends Build {
val root = Project("root", file(".")) settings( val root = Project("root", file(".")) settings(
resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns), resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns),
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.0-symlink-3"), addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.3"),
libraryDependencies += "net.databinder" % "dispatch-http_2.9.1" % "0.8.6" libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10"
) //dependsOn(nativePackager) ) //dependsOn(nativePackager)