From 70c725fc3bfb1be84ad69d34f3be764a5f0cdaed Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 12 Apr 2017 23:41:18 -0400 Subject: [PATCH] workaround sbt-native-packager issue --- build.sbt | 2 ++ project/build.properties | 3 ++- project/plugins.sbt | 2 +- src/debian/changelog | 8 ++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 3ece5978a..58c8d6c5a 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,7 @@ import scala.util.control.Exception.catching import _root_.bintray.InternalBintrayKeys._ import _root_.bintray.{BintrayRepo, Bintray} import NativePackagerHelper._ +import com.typesafe.sbt.packager.SettingsHelper._ lazy val sbtOfflineInstall = sys.props.getOrElse("sbt.build.offline", sys.env.getOrElse("sbt.build.offline", "true")) match { @@ -86,6 +87,7 @@ val root = (project in file(".")). ) withUser "root" withGroup "root" withPerms "0644" gzipped) asDocs() }, debianChangelog in Debian := { Some(sourceDirectory.value / "debian" / "changelog") }, + addPackage(Debian, packageBin in Debian, "deb"), // RPM SPECIFIC version in Rpm := { val stable = (sbtVersionToRelease split "[^\\d]" filterNot (_.isEmpty) mkString ".") diff --git a/project/build.properties b/project/build.properties index 27e88aa11..6818e9c44 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1,2 @@ -sbt.version=0.13.13 +sbt.version=0.13.15 + diff --git a/project/plugins.sbt b/project/plugins.sbt index 74869e0ed..8c212a981 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4") +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8") libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10" addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0") addSbtPlugin("com.eed3si9n" % "sbt-export-repo" % "0.1.0") diff --git a/src/debian/changelog b/src/debian/changelog index 810742dc3..bfd730ff9 100644 --- a/src/debian/changelog +++ b/src/debian/changelog @@ -1,3 +1,11 @@ +sbt (0.13.15) stable; urgency=low + + * sbt 0.13.15 removes the Maven version range when possible. + * Adds preliminary compatibility with JDK 9. Using this requires 0.13.15+ launcher. #2951 by @retronym + * Adds "local-preloaded" repository for offline installation + + -- Eugene Yokota Mon, 10 Apr 2017 00:00:00 +0000 + sbt (0.13.13) stable; urgency=low * The `new` command, which helps creating new build definitions.