From df31ed1fcbc25f96a7c76fe8690468ac0566c985 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Thu, 19 Jul 2012 11:13:03 -0400 Subject: [PATCH 1/4] Fixed issue with sbt versioning for RC releases in windows. --- project/packaging.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/packaging.scala b/project/packaging.scala index 0bd2d3294..fc5486d36 100644 --- a/project/packaging.scala +++ b/project/packaging.scala @@ -190,7 +190,7 @@ object Packaging { ) def makeWindowsXml(sbtVersion: String, sourceDir: File): scala.xml.Node = { - val version = (sbtVersion split "\\.") match { + val version = (sbtVersion split "[^\\d]" filterNot (_.isEmpty)) match { case Array(major,minor,bugfix, _*) => Seq(major,minor,bugfix, "1") mkString "." case Array(major,minor) => Seq(major,minor,"0","1") mkString "." case Array(major) => Seq(major,"0","0","1") mkString "." From 872d88ea237301a32f98dac0db1acd75c1b333bb Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Fri, 7 Sep 2012 12:58:02 -0400 Subject: [PATCH 2/4] Updated build so you can specify SBT version on the command line. --- project/build.scala | 6 +++++- project/project/plugins.scala | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/project/build.scala b/project/build.scala index b3e4ba4ab..82e6e13aa 100644 --- a/project/build.scala +++ b/project/build.scala @@ -3,7 +3,11 @@ import Keys._ object SbtExtras extends Build { // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution. - val root = Project("sbt-packaging", file(".")) settings(Packaging.settings:_*) + val root = Project("sbt-packaging", file(".")) settings(Packaging.settings:_*) settings( + sbtVersion <<= sbtVersion apply { v => + sys.props.getOrElse("sbt.build.version", v) + } + ) val meta = Project("metapackage", file("metapackage")) settings(MetaPackaging.settings(root):_*) } diff --git a/project/project/plugins.scala b/project/project/plugins.scala index b9561d413..5ce8cb116 100644 --- a/project/project/plugins.scala +++ b/project/project/plugins.scala @@ -7,6 +7,6 @@ object PluginBuild extends Build { val root = Project("root", file(".")) settings( resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns), addSbtPlugin("com.typesafe" % "sbt-native-packager" % "0.4.3"), - libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.6" + libraryDependencies += "net.databinder" % "dispatch-http_2.9.1" % "0.8.6" ) } From 5407a218034bdc2e60e4702ced0431bae9bbe8c9 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Fri, 7 Sep 2012 13:52:05 -0400 Subject: [PATCH 3/4] Use environment variable thanks to lame sbt jenkins plugin --- project/build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.scala b/project/build.scala index 82e6e13aa..61adf4122 100644 --- a/project/build.scala +++ b/project/build.scala @@ -5,7 +5,7 @@ object SbtExtras extends Build { // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution. val root = Project("sbt-packaging", file(".")) settings(Packaging.settings:_*) settings( sbtVersion <<= sbtVersion apply { v => - sys.props.getOrElse("sbt.build.version", v) + sys.props.getOrElse("sbt.build.version", sys.env.getOrElse("sbt.build.version", v)) } ) From 0ac0a4767d944b8b8f04416a45a2b4b5f8b5199c Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Fri, 7 Sep 2012 14:08:46 -0400 Subject: [PATCH 4/4] Bumped to new sbt launcher that supports publishing universal packages. --- project/project/plugins.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/project/plugins.scala b/project/project/plugins.scala index 5ce8cb116..cf7cd2c8f 100644 --- a/project/project/plugins.scala +++ b/project/project/plugins.scala @@ -6,7 +6,7 @@ object PluginBuild extends Build { val root = Project("root", file(".")) settings( resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns), - addSbtPlugin("com.typesafe" % "sbt-native-packager" % "0.4.3"), + addSbtPlugin("com.typesafe" % "sbt-native-packager" % "0.4.4"), libraryDependencies += "net.databinder" % "dispatch-http_2.9.1" % "0.8.6" ) }