diff --git a/build.sbt b/build.sbt index 2f39ed5727..7059b142c8 100644 --- a/build.sbt +++ b/build.sbt @@ -76,7 +76,7 @@ linuxPackageMappings ~= { _.map { pm => packageBin := { (packageBin in Universal).value (packageBin in Debian).value - //(packageBin in Rpm).value + (packageBin in Rpm).value } // DEB // debianPackageRecommends := Seq("elasticsearch") diff --git a/project/Bintray.scala b/project/Bintray.scala index 281817eb6f..7336b234f9 100644 --- a/project/Bintray.scala +++ b/project/Bintray.scala @@ -3,6 +3,7 @@ import java.io.File import bintray.BintrayCredentials import bintray.BintrayKeys.{bintrayEnsureCredentials, bintrayOrganization, bintrayPackage, bintrayRepository} import bintry.Client +import com.typesafe.sbt.packager.Keys._ import com.typesafe.sbt.packager.debian.DebianPlugin.autoImport.Debian import com.typesafe.sbt.packager.rpm.RpmPlugin.autoImport.Rpm import com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.Universal @@ -21,7 +22,7 @@ object PublishToBinTray extends Plugin { val publishRpm = taskKey[Unit]("publish rpm package in Bintray") override def settings = Seq( - publishRelease := { + publishRelease in ThisBuild := { val file = (packageBin in Universal).value btPublish(file.getName, file, @@ -32,7 +33,7 @@ object PublishToBinTray extends Plugin { version.value, sLog.value) }, - publishLatest := { + publishLatest in ThisBuild := { val file = (packageBin in Universal).value val latestName = file.getName.replace(version.value, "latest") if (latestName == file.getName) @@ -53,8 +54,8 @@ object PublishToBinTray extends Plugin { sLog.value) } }, - publishDebian := { - val file = (packageBin in Debian).value + publishDebian in ThisBuild := { + val file = (debianSign in Debian).value btPublish(file.getName, file, bintrayEnsureCredentials.value, @@ -68,7 +69,7 @@ object PublishToBinTray extends Plugin { "deb_architecture" -> "all" ) }, - publishRpm := { + publishRpm in ThisBuild := { val file = (packageBin in Rpm).value btPublish(file.getName, file,