diff --git a/build.sbt b/build.sbt index 71f16dd60..9148dc361 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,4 @@ -import com.typesafe.sbt.packager.Keys._ -import com.typesafe.sbt.SbtNativePackager._ -import util.control.Exception.catching +import scala.util.control.Exception.catching import _root_.bintray.InternalBintrayKeys._ import _root_.bintray.{BintrayRepo, Bintray} @@ -25,15 +23,13 @@ val windowsBuildId = settingKey[Int]("build id for Windows installer") // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution. val root = (project in file(".")). + enablePlugins(UniversalPlugin, LinuxPlugin, DebianPlugin, RpmPlugin, WindowsPlugin). settings( organization := "org.scala-sbt", name := "sbt-launcher-packaging", version := "0.1.0", crossTarget <<= target, - packagerSettings, deploymentSettings, - mapGenericFilesToLinux, - mapGenericFilesToWindows, publishToSettings, sbtLaunchJarUrl := downloadUrlForVersion(sbtVersionToRelease), sbtLaunchJarLocation <<= target apply (_ / "sbt-launch.jar"), diff --git a/project/project/plugins.scala b/project/project/plugins.scala index ddc50a0f4..44a311937 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" % "sbt-native-packager" % "0.6.3"), + addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1"), libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10" ) //dependsOn(nativePackager)