Allow specifying classifier for default package in deployment settings

Wojciech Pitula · muuki88 · commit 7704e98ebe90 · 2017-06-06T23:10:16.000+02:00
diff --git a/src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala b/src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala
@@ -25,7 +25,10 @@ object SettingsHelper {
       )
     )
 
-  def makeDeploymentSettings(config: Configuration, packageTask: TaskKey[File], extension: String): Seq[Setting[_]] =
+  def makeDeploymentSettings(config: Configuration,
+                             packageTask: TaskKey[File],
+                             extension: String,
+                             classifier: Option[String] = None): Seq[Setting[_]] =
     inConfig(config)(Classpaths.publishSettings) ++ inConfig(config)(
       Seq(
         artifacts := Seq.empty,
@@ -55,5 +58,5 @@ object SettingsHelper {
           overwrite = isSnapshot.value
         )
       )
-    ) ++ addPackage(config, packageTask, extension)
+    ) ++ addPackage(config, packageTask, extension, classifier)
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,10 @@ object SettingsHelper {`
`25`	`25`	`)`
`26`	`26`	`)`
`27`	`27`
`28`		`- def makeDeploymentSettings(config: Configuration, packageTask: TaskKey[File], extension: String): Seq[Setting[_]] =`
	`28`	`+ def makeDeploymentSettings(config: Configuration,`
	`29`	`+ packageTask: TaskKey[File],`
	`30`	`+ extension: String,`
	`31`	`+ classifier: Option[String] = None): Seq[Setting[_]] =`
`29`	`32`	`inConfig(config)(Classpaths.publishSettings) ++ inConfig(config)(`
`30`	`33`	`Seq(`
`31`	`34`	`artifacts := Seq.empty,`
`@@ -55,5 +58,5 @@ object SettingsHelper {`
`55`	`58`	`overwrite = isSnapshot.value`
`56`	`59`	`)`
`57`	`60`	`)`
`58`		`- ) ++ addPackage(config, packageTask, extension)`
	`61`	`+ ) ++ addPackage(config, packageTask, extension, classifier)`
`59`	`62`	`}`