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" ) }