Wip/upgrade build

build.sbt

@@ -52,7 +52,7 @@ bintrayRepository := "sbt-plugin-releases"
 
 // scalariform
 import scalariform.formatter.preferences._
-scalariformSettings
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 ScalariformKeys.preferences := ScalariformKeys.preferences.value
   .setPreference(AlignParameters, false)
   .setPreference(FormatXml, true)

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.11

project/plugins.sbt

@@ -14,4 +14,4 @@ libraryDependencies += "jline" % "jline" % "2.11"
 addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
 
 // For code formatting
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")

src/main/scala/com/typesafe/sbt/packager/MappingsHelper.scala

@@ -114,7 +114,8 @@ object MappingsHelper {
     entries: Seq[Attributed[File]],
     target: String,
     includeArtifact: Artifact => Boolean,
-    includeOnNoArtifact: Boolean = false): Seq[(File, String)] = {
+    includeOnNoArtifact: Boolean = false
+  ): Seq[(File, String)] = {
 
     entries
       .filter(attr => attr.get(sbt.Keys.artifact.key) map includeArtifact getOrElse includeOnNoArtifact)

src/main/scala/com/typesafe/sbt/packager/archetypes/AkkaApp.scala

@@ -10,9 +10,9 @@ import SbtNativePackager.Universal
 
 /**
  * == Deprecated ==
- * 
+ *
  * Use `JavaAppPackaging` instead. Akka Microkernel will be removed soon.
- * 
+ *
  * Provides a new default script for akka-micro-kernel applications.
  * This plugin requires the [[com.typesafe.sbt.packager.archetypes.JavaAppPackaging]],
  * which will be automatically enabled.

src/main/scala/com/typesafe/sbt/packager/archetypes/AshScriptPlugin.scala

@@ -23,14 +23,14 @@ import SbtNativePackager.{ Universal, Debian }
  * in a highly-constrained environment like ash+BusyBox.  Something much simpler will do, for example:
  *
  * #!/usr/bin/env sh
- * 
+ *
  * realpath () {
  * (
  *   TARGET_FILE="$1"
- * 
+ *
  *   cd "$(dirname "$TARGET_FILE")"
  *   TARGET_FILE=$(basename "$TARGET_FILE")
- * 
+ *
  *   COUNT=0
  *   while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
  *   do
@@ -39,25 +39,25 @@ import SbtNativePackager.{ Universal, Debian }
  *       TARGET_FILE=$(basename "$TARGET_FILE")
  *       COUNT=$(($COUNT + 1))
  *   done
- * 
+ *
  *   if [ "$TARGET_FILE" == "." -o "$TARGET_FILE" == ".." ]; then
  *     cd "$TARGET_FILE"
  *     TARGET_FILEPATH=
  *   else
  *     TARGET_FILEPATH=/$TARGET_FILE
  *   fi
- * 
+ *
  *   echo "$(pwd -P)/$TARGET_FILE"
  * )
  * }
- * 
+ *
  * real_script_path="$(realpath "$0")"
  * app_home="$(realpath "$(dirname "$real_script_path")")"
  * lib_dir="$(realpath "${app_home}/../lib")"
- * 
+ *
  * ${{template_declares}}
- * 
- * java -classpath $app_classpath $app_mainclass $@ 
+ *
+ * java -classpath $app_classpath $app_mainclass $@
  *
  *
  * == Configuration ==
@@ -89,7 +89,7 @@ object AshScriptPlugin extends AutoPlugin {
         } yield JavaAppAshScript.makeDefines(cn, appClasspath = cp, extras = extras, configFile = config)
       hasMain getOrElse Nil
     }
-    )
+  )
 
   def makeUniversalAshScript(defaultTemplateLocation: File, defines: Seq[String], tmpDir: File, name: String, sourceDir: File): Option[File] =
     if (defines.isEmpty) None

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaAppAshScript.scala

@@ -26,7 +26,8 @@ object JavaAppAshScript {
     mainClass: String,
     appClasspath: Seq[String] = Seq("*"),
     configFile: Option[String] = None,
-    extras: Seq[String] = Nil): Seq[String] =
+    extras: Seq[String] = Nil
+  ): Seq[String] =
     Seq(mainClassDefine(mainClass)) ++
       (configFile map configFileDefine).toSeq ++
       Seq(makeClasspathDefine(appClasspath)) ++

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaAppBashScript.scala

@@ -26,7 +26,8 @@ object JavaAppBashScript {
     mainClass: String,
     appClasspath: Seq[String] = Seq("*"),
     configFile: Option[String] = None,
-    extras: Seq[String] = Nil): Seq[String] =
+    extras: Seq[String] = Nil
+  ): Seq[String] =
     Seq(mainClassDefine(mainClass)) ++
       (configFile map configFileDefine).toSeq ++
       Seq(makeClasspathDefine(appClasspath)) ++

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaAppBatScript.scala

@@ -28,7 +28,8 @@ object JavaAppBatScript {
     name: String,
     mainClass: String,
     appClasspath: Seq[String] = Seq("*"),
-    extras: Seq[String] = Nil): Seq[(String, String)] = {
+    extras: Seq[String] = Nil
+  ): Seq[(String, String)] = {
     val replacements = Seq(
       "APP_NAME" -> name,
       "APP_ENV_NAME" -> makeEnvFriendlyName(name)
@@ -50,7 +51,8 @@ object JavaAppBatScript {
   }
 
   def generateScript(
-    replacements: Seq[(String, String)], template: java.net.URL = bashTemplateSource): String =
+    replacements: Seq[(String, String)], template: java.net.URL = bashTemplateSource
+  ): String =
     TemplateWriter.generateScript(template, replacements, "\r\n", TemplateWriter.batFriendlyKeySurround)
 
 }

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala

@@ -69,75 +69,77 @@ object JavaServerAppPackaging extends AutoPlugin {
   private[this] val etcDefaultConfig: Seq[Setting[_]] = Seq(
     linuxEtcDefaultTemplate := getEtcTemplateSource(
       sourceDirectory.value,
-      (serverLoading ?? None).value),
+      (serverLoading ?? None).value
+    ),
     makeEtcDefault := makeEtcDefaultScript(
       packageName.value,
       (target in Universal).value,
       linuxEtcDefaultTemplate.value,
-      linuxScriptReplacements.value),
+      linuxScriptReplacements.value
+    ),
     linuxPackageMappings ++= etcDefaultMapping(
       makeEtcDefault.value,
-      bashScriptEnvConfigLocation.value)
+      bashScriptEnvConfigLocation.value
+    )
   )
 
   def debianSettings: Seq[Setting[_]] = {
     import DebianPlugin.Names.{ Preinst, Postinst, Prerm, Postrm }
     inConfig(Debian)(etcDefaultConfig) ++
-    inConfig(Debian)(Seq(
-      // === Extra replacements ===
-      linuxScriptReplacements ++= bashScriptEnvConfigLocation.value.map(ENV_CONFIG_REPLACEMENT -> _).toSeq,
-      linuxScriptReplacements += Names.DaemonStdoutLogFileReplacement -> daemonStdoutLogFile.value.getOrElse(""),
-
-      // === Maintainer scripts ===
-      maintainerScripts := {
-        val scripts = (maintainerScripts in Debian).value
-        val replacements = (linuxScriptReplacements in Debian).value
-        val contentOf = getScriptContent(Debian, replacements) _
-
-        scripts ++ Map(
-          Preinst -> (scripts.getOrElse(Preinst, Nil) ++ contentOf(Preinst)),
-          Postinst -> (scripts.getOrElse(Postinst, Nil) ++ contentOf(Postinst)),
-          Prerm -> (scripts.getOrElse(Prerm, Nil) ++ contentOf(Prerm)),
-          Postrm -> (scripts.getOrElse(Postrm, Nil) ++ contentOf(Postrm))
-        )
-      }
-    )) ++ Seq(
-      // === Daemon User and Group ===
-      daemonUser in Debian <<= daemonUser in Linux,
-      daemonUserUid in Debian <<= daemonUserUid in Linux,
-      daemonGroup in Debian <<= daemonGroup in Linux,
-      daemonGroupGid in Debian <<= daemonGroupGid in Linux
-    )
+      inConfig(Debian)(Seq(
+        // === Extra replacements ===
+        linuxScriptReplacements ++= bashScriptEnvConfigLocation.value.map(ENV_CONFIG_REPLACEMENT -> _).toSeq,
+        linuxScriptReplacements += Names.DaemonStdoutLogFileReplacement -> daemonStdoutLogFile.value.getOrElse(""),
+
+        // === Maintainer scripts ===
+        maintainerScripts := {
+          val scripts = (maintainerScripts in Debian).value
+          val replacements = (linuxScriptReplacements in Debian).value
+          val contentOf = getScriptContent(Debian, replacements) _
+
+          scripts ++ Map(
+            Preinst -> (scripts.getOrElse(Preinst, Nil) ++ contentOf(Preinst)),
+            Postinst -> (scripts.getOrElse(Postinst, Nil) ++ contentOf(Postinst)),
+            Prerm -> (scripts.getOrElse(Prerm, Nil) ++ contentOf(Prerm)),
+            Postrm -> (scripts.getOrElse(Postrm, Nil) ++ contentOf(Postrm))
+          )
+        }
+      )) ++ Seq(
+        // === Daemon User and Group ===
+        daemonUser in Debian <<= daemonUser in Linux,
+        daemonUserUid in Debian <<= daemonUserUid in Linux,
+        daemonGroup in Debian <<= daemonGroup in Linux,
+        daemonGroupGid in Debian <<= daemonGroupGid in Linux
+      )
   }
 
   def rpmSettings: Seq[Setting[_]] = {
     import RpmPlugin.Names.{ Pre, Post, Preun, Postun }
     inConfig(Rpm)(etcDefaultConfig) ++
-    inConfig(Rpm)(Seq(
-      // === Extra replacements ===
-      linuxScriptReplacements ++= bashScriptEnvConfigLocation.value.map(ENV_CONFIG_REPLACEMENT -> _).toSeq,
-      linuxScriptReplacements += Names.DaemonStdoutLogFileReplacement -> daemonStdoutLogFile.value.getOrElse(""),
-
-      // === /var/run/app pid folder ===
-      linuxPackageMappings <+= (packageName, daemonUser, daemonGroup) map { (name, user, group) =>
-        packageTemplateMapping("/var/run/" + name)() withUser user withGroup group withPerms "755"
-      }
-    )) ++ Seq(
-      // === Daemon User and Group ===
-      daemonUser in Rpm <<= daemonUser in Linux,
-      daemonUserUid in Rpm <<= daemonUserUid in Linux,
-      daemonGroup in Rpm <<= daemonGroup in Linux,
-      daemonGroupGid in Rpm <<= daemonGroupGid in Linux,
-      // == Maintainer scripts ===
-      maintainerScripts in Rpm := rpmScriptletContents(rpmScriptsDirectory.value, (maintainerScripts in Rpm).value, (linuxScriptReplacements in Rpm).value)
-    )
+      inConfig(Rpm)(Seq(
+        // === Extra replacements ===
+        linuxScriptReplacements ++= bashScriptEnvConfigLocation.value.map(ENV_CONFIG_REPLACEMENT -> _).toSeq,
+        linuxScriptReplacements += Names.DaemonStdoutLogFileReplacement -> daemonStdoutLogFile.value.getOrElse(""),
+
+        // === /var/run/app pid folder ===
+        linuxPackageMappings <+= (packageName, daemonUser, daemonGroup) map { (name, user, group) =>
+          packageTemplateMapping("/var/run/" + name)() withUser user withGroup group withPerms "755"
+        }
+      )) ++ Seq(
+        // === Daemon User and Group ===
+        daemonUser in Rpm <<= daemonUser in Linux,
+        daemonUserUid in Rpm <<= daemonUserUid in Linux,
+        daemonGroup in Rpm <<= daemonGroup in Linux,
+        daemonGroupGid in Rpm <<= daemonGroupGid in Linux,
+        // == Maintainer scripts ===
+        maintainerScripts in Rpm := rpmScriptletContents(rpmScriptsDirectory.value, (maintainerScripts in Rpm).value, (linuxScriptReplacements in Rpm).value)
+      )
   }
 
   /* ==========================================  */
   /* ============ Helper Methods ==============  */
   /* ==========================================  */
 
-
   /* Find the template source for the given Server loading scheme, with cascading fallback
    * If the serverLoader scheme is SystemD, then searches for files in this order:
    *
@@ -157,7 +159,8 @@ object JavaServerAppPackaging extends AutoPlugin {
 
     val overrides = List[File](
       sourceDirectory / "templates" / (ETC_DEFAULT + suffix),
-      sourceDirectory / "templates" / ETC_DEFAULT)
+      sourceDirectory / "templates" / ETC_DEFAULT
+    )
     overrides.
       find(_.exists).
       map(_.toURI.toURL).
@@ -198,7 +201,8 @@ object JavaServerAppPackaging extends AutoPlugin {
    * @return Some(file: File)
    */
   protected def makeEtcDefaultScript(
-    name: String, tmpDir: File, source: java.net.URL, replacements: Seq[(String, String)]): Option[File] = {
+    name: String, tmpDir: File, source: java.net.URL, replacements: Seq[(String, String)]
+  ): Option[File] = {
     val scriptBits = TemplateWriter.generateScript(source, replacements)
     val script = tmpDir / "tmp" / "etc" / "default" / name
     IO.write(script, scriptBits)

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerBashScript.scala

@@ -40,7 +40,8 @@ object JavaServerBashScript {
     archetype: String,
     config: Configuration,
     replacements: Seq[(String, String)],
-    template: Option[URL] = None): Option[String] = {
+    template: Option[URL] = None
+  ): Option[String] = {
     // use template or else search for a default
     val url = template orElse {
       Option(getClass getResource s"$archetype/${config.name}/$script-template")

src/main/scala/com/typesafe/sbt/packager/archetypes/MaintainerScriptHelper.scala

@@ -66,7 +66,8 @@ trait MaintainerScriptHelper {
    */
   def maintainerScriptsAppend(
     current: Map[String, Seq[String]] = Map.empty,
-    replacements: Seq[(String, String)] = Nil)(scripts: (String, String)*): Map[String, Seq[String]] = {
+    replacements: Seq[(String, String)] = Nil
+  )(scripts: (String, String)*): Map[String, Seq[String]] = {
     val appended = scripts.map {
       case (key, script) => key -> TemplateWriter.generateScriptFromLines(
         (current.getOrElse(key, Seq.empty) :+ script),

src/main/scala/com/typesafe/sbt/packager/archetypes/TemplateWriter.scala

@@ -35,7 +35,8 @@ object TemplateWriter {
   private def replace(
     line: String,
     replacements: Seq[(String, String)],
-    keySurround: String => String): String = {
+    keySurround: String => String
+  ): String = {
     replacements.foldLeft(line) {
       case (line, (key, value)) =>
         keySurround(key).r.replaceAllIn(line, java.util.regex.Matcher.quoteReplacement(value))
@@ -46,7 +47,8 @@ object TemplateWriter {
     lines: Seq[String],
     replacements: Seq[(String, String)],
     eol: String,
-    keySurround: String => String): String = {
+    keySurround: String => String
+  ): String = {
     val sb = new StringBuilder
     for (line <- lines) {
       sb append replace(line, replacements, keySurround)
@@ -64,7 +66,8 @@ object TemplateWriter {
     replacements: Seq[(String, String)],
     eol: String = "\n",
     keySurround: String => String = bashFriendlyKeySurround,
-    charset: java.nio.charset.Charset = defaultCharset): String = {
+    charset: java.nio.charset.Charset = defaultCharset
+  ): String = {
     val lines = sbt.IO.readLinesURL(source, charset)
     replaceValues(lines, replacements, eol, keySurround)
   }
@@ -74,7 +77,8 @@ object TemplateWriter {
     replacements: Seq[(String, String)],
     eol: String = "\n",
     keySurround: String => String = bashFriendlyKeySurround,
-    charset: java.nio.charset.Charset = defaultCharset): String = {
+    charset: java.nio.charset.Charset = defaultCharset
+  ): String = {
     replaceValues(source split eol, replacements, eol, keySurround)
   }
 
@@ -88,7 +92,8 @@ object TemplateWriter {
     lines: Seq[String],
     replacements: Seq[(String, String)],
     keySurround: String => String = bashFriendlyKeySurround,
-    charset: java.nio.charset.Charset = defaultCharset): Seq[String] = {
+    charset: java.nio.charset.Charset = defaultCharset
+  ): Seq[String] = {
     replaceValues(lines, replacements, keySurround)
   }
 }