diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..753ff1a58 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.3 +fb3b1e158c70f5b76207764dc42b128cb878b3be diff --git a/.github/workflows/publish-site.yml b/.github/workflows/publish-site.yml new file mode 100644 index 000000000..1b7822246 --- /dev/null +++ b/.github/workflows/publish-site.yml @@ -0,0 +1,31 @@ +name: Publish Site +on: + push: + tags: ["*"] +jobs: + publish: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + # setup build environment + - uses: coursier/cache-action@v5 + - uses: olafurpg/setup-scala@v12 + + # this setup is all for the github pages deployment to work + - name: install sphinx + run: | + pip3 install --user sphinx sphinx_rtd_theme + which sphinx-build + + - name: setup git + run: | + git config --global user.name github-actions + git config --global user.email github-actions@github.com + + - name: Publish Site + run: sbt ghpagesPushSite + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad24bd6ca..3ea0099ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,24 +20,6 @@ jobs: SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - # this setup is all for the github pages deployment to work - - name: install sphinx - run: | - pip3 install --user sphinx sphinx_rtd_theme - which sphinx-build - - - name: setup git - run: | - git config user.name github-actions - git config user.email github-actions@github.com - - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_KEY }} - known_hosts: ${{ secrets.KNOWN_HOSTS }} - - run: sbt ghpagesPushSite - # generate a github release - name: Generate release changelog id: changelog diff --git a/.scalafmt.conf b/.scalafmt.conf index 9812c0007..84293359d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ # Version https://scalameta.org/scalafmt/docs/configuration.html#version -version = 3.8.1 +version = 3.8.3 # Dialect https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects runner.dialect = scala212 diff --git a/build.sbt b/build.sbt index 4e82b1d5a..c7d5d5161 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ libraryDependencies ++= Seq( "org.apache.ant" % "ant" % "1.10.14", // workaround for the command line size limit "com.github.eldis" % "tool-launcher" % "0.2.2", - "org.scalatest" %% "scalatest" % "3.0.9" % Test + "org.scalatest" %% "scalatest" % "3.2.19" % Test ) // sbt dependent libraries @@ -53,7 +53,12 @@ libraryDependencies ++= { // configure github page enablePlugins(SphinxPlugin, SiteScaladocPlugin, GhpagesPlugin, SbtPlugin) -git.remoteRepo := "git@github.com:sbt/sbt-native-packager.git" +git.remoteRepo := { + sys.env.get("GITHUB_TOKEN") match { + case Some(token) => s"https://x-access-token:$token@github.com/sbt/sbt-native-packager" + case None => "git@github.com:sbt/sbt-native-packager.git" + } +} // scripted test settings scriptedLaunchOpts += "-Dproject.version=" + version.value diff --git a/integration-tests-ansible/test-project-play-rpm/build.sbt b/integration-tests-ansible/test-project-play-rpm/build.sbt index 913443d53..a4d97caea 100644 --- a/integration-tests-ansible/test-project-play-rpm/build.sbt +++ b/integration-tests-ansible/test-project-play-rpm/build.sbt @@ -1,14 +1,6 @@ scalaVersion in ThisBuild := "2.11.6" -scalacOptions in ThisBuild ++= Seq( - "-deprecation", - "-encoding", - "UTF-8", - "-feature", - "-unchecked", - "-Xfuture", - "-Xlint" -) +scalacOptions in ThisBuild ++= Seq("-deprecation", "-encoding", "UTF-8", "-feature", "-unchecked", "-Xfuture", "-Xlint") name := "test-project-play-rpm" diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template index bf8866ecc..2b6a693df 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template @@ -44,7 +44,7 @@ addApp () { } shellEscape () { - printf "'%s'" "$(printf %s "$1" | sed "s/'/'\\\\''/")" + printf "'%s'" "$(printf %s "$1" | sed "s/'/'\\\\''/g")" } addResidual () { diff --git a/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/Compat.scala b/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/Compat.scala index 733137bf3..2f1cab8de 100644 --- a/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/Compat.scala +++ b/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/Compat.scala @@ -9,14 +9,15 @@ object Compat { /** * Used in: * - * - [[com.typesafe.sbt.packager.windows.WindowsPlugin]] - * - [[com.typesafe.sbt.packager.rpm.RpmHelper]] - * - [[com.typesafe.sbt.packager.docker.DockerPlugin]] - * - [[com.typesafe.sbt.packager.debian.DebianNativePackaging]] - * - [[com.typesafe.sbt.packager.rpm.RpmPlugin]] + * - [[com.typesafe.sbt.packager.windows.WindowsPlugin]] + * - [[com.typesafe.sbt.packager.rpm.RpmHelper]] + * - [[com.typesafe.sbt.packager.docker.DockerPlugin]] + * - [[com.typesafe.sbt.packager.debian.DebianNativePackaging]] + * - [[com.typesafe.sbt.packager.rpm.RpmPlugin]] * * @param log - * @return turns a Logger into a ProcessLogger + * @return + * turns a Logger into a ProcessLogger */ implicit def log2ProcessLogger(log: Logger): sys.process.ProcessLogger = new BufferedLogger(new FullLogger(log)) with sys.process.ProcessLogger { @@ -27,17 +28,20 @@ object Compat { /** * Used in * - * - [[com.typesafe.sbt.packager.docker.DockerPlugin]] + * - [[com.typesafe.sbt.packager.docker.DockerPlugin]] * - * @param logger The sbt.ProcessLogger that should be wrapped - * @return A scala ProcessLogger + * @param logger + * The sbt.ProcessLogger that should be wrapped + * @return + * A scala ProcessLogger */ implicit def sbtProcessLogger2ScalaProcessLogger(logger: sbt.ProcessLogger): sys.process.ProcessLogger = ProcessLogger(msg => logger.info(msg), err => logger.error(err)) /** * Use in the scripted `universal/multiproject-classifiers` test. - * @param artifact polyfill new methods + * @param artifact + * polyfill new methods */ implicit class CompatArtifact(artifact: Artifact) { def withClassifier(classifier: Option[String]): Artifact = diff --git a/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/MappingsHelper.scala b/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/MappingsHelper.scala index 5d23cbb67..636dc3126 100644 --- a/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/MappingsHelper.scala +++ b/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/MappingsHelper.scala @@ -9,12 +9,13 @@ object MappingsHelper { * return a Seq of mappings which effect is to add a whole directory in the generated package * * @example - * {{{ + * {{{ * mappings in Universal ++= directory(baseDirectory.value / "extra") - * }}} + * }}} * * @param sourceDir - * @return mappings + * @return + * mappings */ def directory(sourceDir: File): Seq[(File, String)] = Option(sourceDir.getParentFile) @@ -25,27 +26,29 @@ object MappingsHelper { * It lightens the build file if one wants to give a string instead of file. * * @example - * {{{ + * {{{ * mappings in Universal ++= directory("extra") - * }}} + * }}} * * @param sourceDir - * @return mappings + * @return + * mappings */ def directory(sourceDir: String): Seq[(File, String)] = directory(file(sourceDir)) /** - * return a Seq of mappings which effect is to add the content of directory in the generated package, - * excluding the directory itself. + * return a Seq of mappings which effect is to add the content of directory in the generated package, excluding the + * directory itself. * * @example - * {{{ + * {{{ * mappings in Universal ++= sourceDir(baseDirectory.value / "extra") - * }}} + * }}} * * @param sourceDir - * @return mappings + * @return + * mappings */ def contentOf(sourceDir: File): Seq[(File, String)] = (sourceDir.*** --- sourceDir) pair relativeTo(sourceDir) @@ -54,50 +57,57 @@ object MappingsHelper { * It lightens the build file if one wants to give a string instead of file. * * @example - * {{{ + * {{{ * mappings in Universal ++= sourceDir("extra") - * }}} + * }}} * - * @param sourceDir as string representation - * @return mappings + * @param sourceDir + * as string representation + * @return + * mappings */ def contentOf(sourceDir: String): Seq[(File, String)] = contentOf(file(sourceDir)) /** - * Create mappings from your classpath. For example if you want to add additional - * dependencies, like test or model. + * Create mappings from your classpath. For example if you want to add additional dependencies, like test or model. * - * @example Add all test artifacts to a separated test folder - * {{{ + * @example + * Add all test artifacts to a separated test folder + * {{{ * mappings in Universal ++= fromClasspath((managedClasspath in Test).value, target = "test") - * }}} + * }}} * * @param entries * @param target - * @return a list of mappings + * @return + * a list of mappings */ def fromClasspath(entries: Seq[Attributed[File]], target: String): Seq[(File, String)] = fromClasspath(entries, target, _ => true) /** - * Create mappings from your classpath. For example if you want to add additional - * dependencies, like test or model. You can also filter the artifacts that should - * be mapped to mappings. + * Create mappings from your classpath. For example if you want to add additional dependencies, like test or model. + * You can also filter the artifacts that should be mapped to mappings. * - * @example Filter all osgi bundles - * {{{ + * @example + * Filter all osgi bundles + * {{{ * mappings in Universal ++= fromClasspath( * (managedClasspath in Runtime).value, * "osgi", * artifact => artifact.`type` == "bundle" * ) - * }}} + * }}} * - * @param entries from where mappings should be created from - * @param target folder, e.g. `model`. Must not end with a slash - * @param includeArtifact function to determine if an artifact should result in a mapping - * @param includeOnNoArtifact default is false. When there's no Artifact meta data remove it + * @param entries + * from where mappings should be created from + * @param target + * folder, e.g. `model`. Must not end with a slash + * @param includeArtifact + * function to determine if an artifact should result in a mapping + * @param includeOnNoArtifact + * default is false. When there's no Artifact meta data remove it */ def fromClasspath( entries: Seq[Attributed[File]], diff --git a/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/SettingsHelper.scala b/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/SettingsHelper.scala index de02a48b8..5c3580234 100644 --- a/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/SettingsHelper.scala +++ b/src/main/scala-sbt-0.13/com/typesafe/sbt/packager/SettingsHelper.scala @@ -72,8 +72,8 @@ object SettingsHelper { ) ++ addPackage(config, packageTask, extension, classifier) ++ addResolver(config) /** - * SBT looks in the `otherResolvers` setting for resolvers defined in `publishTo`. - * If a user scopes a `publishTo`, e.g. + * SBT looks in the `otherResolvers` setting for resolvers defined in `publishTo`. If a user scopes a `publishTo`, + * e.g. * * {{{ * // publish the rpm to the target folder @@ -82,7 +82,8 @@ object SettingsHelper { * * then the resolver must also be present in the `otherResolvers` * - * @param config the ivy configuration to look for resolvers + * @param config + * the ivy configuration to look for resolvers */ private def addResolver(config: Configuration): Seq[Setting[_]] = Seq(otherResolvers ++= (publishTo in config).value.toSeq) diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala index ed488e975..9c16652ab 100644 --- a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala +++ b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala @@ -383,7 +383,7 @@ object DockerPlugin extends AutoPlugin { * FROM command */ private final def makeFromAs(dockerBaseImage: String, name: String): CmdLike = - Cmd("FROM", dockerBaseImage, "as", name) + Cmd("FROM", dockerBaseImage, "AS", name) /** * @param label diff --git a/src/sbt-test/ash/add-app-settings/build.sbt b/src/sbt-test/ash/add-app-settings/build.sbt index 43bb6ff4a..0e2daac23 100644 --- a/src/sbt-test/ash/add-app-settings/build.sbt +++ b/src/sbt-test/ash/add-app-settings/build.sbt @@ -15,9 +15,9 @@ TaskKey[Unit]("scriptCheck") := { TaskKey[Unit]("runCheck") := { val cwd = (stagingDirectory in Universal).value - val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath) + val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath) val output = (sys.process.Process(cmd, cwd).!!).replaceAll("\n", "") - + assert(output.contains("info"), s"Application did not receive residual arg 'info'") assert(output.contains("help"), s"Application did not receive residual arg 'help'") } diff --git a/src/sbt-test/ash/add-app-settings/src/main/scala/MainApp.scala b/src/sbt-test/ash/add-app-settings/src/main/scala/MainApp.scala index e224d63f6..52e6c7d8a 100644 --- a/src/sbt-test/ash/add-app-settings/src/main/scala/MainApp.scala +++ b/src/sbt-test/ash/add-app-settings/src/main/scala/MainApp.scala @@ -1,3 +1,3 @@ -object MainApp extends App { +object MainApp extends App { println(args.mkString("|")) } diff --git a/src/sbt-test/ash/command-line-settings/build.sbt b/src/sbt-test/ash/command-line-settings/build.sbt index 4ed99facd..84d0361cc 100644 --- a/src/sbt-test/ash/command-line-settings/build.sbt +++ b/src/sbt-test/ash/command-line-settings/build.sbt @@ -23,10 +23,26 @@ TaskKey[Unit]("checkResidual") := { } TaskKey[Unit]("checkComplexResidual") := { - val args = Seq("-J-Dfoo=bar", "arg1", "--", "-J-Dfoo=bar", "arg 2", "--", "\"", "$foo", "'", "%s", "-y", "bla", "\\'", "\\\"") + val args = Seq( + "-J-Dfoo=bar", + "arg1", + "--", + "-J-Dfoo=bar", + "arg 2", + "--", + "\"", + "$foo", + "'", + "%s", + "-y", + "bla", + "\\'", + "\\\"", + "''" + ) val cwd = (stagingDirectory in Universal).value val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath) ++ args - val expected = """arg1|-J-Dfoo=bar|arg 2|--|"|$foo|'|%s|-y|bla|\'|\"""" + val expected = """arg1|-J-Dfoo=bar|arg 2|--|"|$foo|'|%s|-y|bla|\'|\"|''""" val output = (sys.process.Process(cmd, cwd).!!).split("\n").last assert(output == expected, s"Application did not receive residual args '$expected' (got '$output')") diff --git a/src/sbt-test/ash/command-line-settings/src/main/scala/MainApp.scala b/src/sbt-test/ash/command-line-settings/src/main/scala/MainApp.scala index 6f7370ce9..29b022c6f 100644 --- a/src/sbt-test/ash/command-line-settings/src/main/scala/MainApp.scala +++ b/src/sbt-test/ash/command-line-settings/src/main/scala/MainApp.scala @@ -1,4 +1,4 @@ -object MainApp extends App { +object MainApp extends App { println(sys.props.collect { case (k, v) => s"$k=$v" } mkString "\n") println(args.mkString("|")) } diff --git a/src/sbt-test/ash/override-templates/build.sbt b/src/sbt-test/ash/override-templates/build.sbt index 0d3f9c883..3a0124961 100644 --- a/src/sbt-test/ash/override-templates/build.sbt +++ b/src/sbt-test/ash/override-templates/build.sbt @@ -12,8 +12,9 @@ TaskKey[Unit]("runCheckAsh") := { val cwd = (stagingDirectory in Universal).value val source = scala.io.Source.fromFile((cwd / "bin" / packageName.value).getAbsolutePath) - val contents = try source.getLines mkString "\n" - finally source.close() + val contents = + try source.getLines mkString "\n" + finally source.close() assert( contents contains "this is the custom bash template", "Bash template didn't contain the right text: \n" + contents diff --git a/src/sbt-test/bash/override-templates/build.sbt b/src/sbt-test/bash/override-templates/build.sbt index ad357cbe2..32d2aecdf 100644 --- a/src/sbt-test/bash/override-templates/build.sbt +++ b/src/sbt-test/bash/override-templates/build.sbt @@ -14,8 +14,9 @@ TaskKey[Unit]("runCheckBash") := { val cwd = (stagingDirectory in Universal).value val source = scala.io.Source.fromFile((cwd / "bin" / packageName.value).getAbsolutePath) - val contents = try source.getLines mkString "\n" - finally source.close() + val contents = + try source.getLines mkString "\n" + finally source.close() assert( contents contains "this is the custom bash template", "Bash template didn't contain the right text: \n" + contents @@ -27,8 +28,9 @@ TaskKey[Unit]("runCheckBat") := { val batFilename = packageName.value + ".bat" val source = scala.io.Source.fromFile((cwd / "bin" / batFilename).getAbsolutePath) - val contents = try source.getLines mkString "\n" - finally source.close() + val contents = + try source.getLines mkString "\n" + finally source.close() assert( contents contains "this is the custom bat template", "Bat template didn't contain the right text: \n" + contents diff --git a/src/sbt-test/debian/file-permissions/build.sbt b/src/sbt-test/debian/file-permissions/build.sbt index 025478d50..7ff38f46f 100644 --- a/src/sbt-test/debian/file-permissions/build.sbt +++ b/src/sbt-test/debian/file-permissions/build.sbt @@ -11,4 +11,6 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -linuxPackageMappings += packageMapping(((resourceDirectory in Compile).value / "sudoers.d", "/etc/sudoers.d")) withPerms ("0440") asDocs () +linuxPackageMappings += packageMapping( + ((resourceDirectory in Compile).value / "sudoers.d", "/etc/sudoers.d") +) withPerms ("0440") asDocs () diff --git a/src/sbt-test/debian/systemd-deb/build.sbt b/src/sbt-test/debian/systemd-deb/build.sbt index 5265bb8b4..4933c1770 100644 --- a/src/sbt-test/debian/systemd-deb/build.sbt +++ b/src/sbt-test/debian/systemd-deb/build.sbt @@ -36,15 +36,21 @@ TaskKey[Unit]("checkEtcDefault") := { TaskKey[Unit]("checkAutostart") := { val script = IO.read(target.value / "debian-test-0.1.0" / "DEBIAN" / "postinst") - assert(script.contains("""addService debian-test || echo "debian-test could not be registered" + assert( + script.contains("""addService debian-test || echo "debian-test could not be registered" |startService debian-test || echo "debian-test could not be started" - |""".stripMargin), "addService, startService post install commands missing or incorrect") + |""".stripMargin), + "addService, startService post install commands missing or incorrect" + ) () } TaskKey[Unit]("checkNoAutostart") := { val script = IO.read(target.value / "debian-test-0.1.0" / "DEBIAN" / "postinst") - assert(script.contains("""addService debian-test || echo "debian-test could not be registered" - |""".stripMargin), "addService post install commands missing or incorrect") + assert( + script.contains("""addService debian-test || echo "debian-test could not be registered" + |""".stripMargin), + "addService post install commands missing or incorrect" + ) () } diff --git a/src/sbt-test/debian/systemd-deb/src/main/scala/test/Main.scala b/src/sbt-test/debian/systemd-deb/src/main/scala/test/Main.scala index 6b4b11962..3feb58d4a 100644 --- a/src/sbt-test/debian/systemd-deb/src/main/scala/test/Main.scala +++ b/src/sbt-test/debian/systemd-deb/src/main/scala/test/Main.scala @@ -1,10 +1,8 @@ package test object Main { - def main (args: Array[String]): Unit = { - //server app imitation - while (true){ + def main(args: Array[String]): Unit = + // server app imitation + while (true) Thread.sleep(1000L) - } - } -} \ No newline at end of file +} diff --git a/src/sbt-test/debian/sysvinit-deb/build.sbt b/src/sbt-test/debian/sysvinit-deb/build.sbt index fdcf8d452..7018ccbcd 100644 --- a/src/sbt-test/debian/sysvinit-deb/build.sbt +++ b/src/sbt-test/debian/sysvinit-deb/build.sbt @@ -61,15 +61,21 @@ TaskKey[Unit]("checkStartupScript") := { TaskKey[Unit]("checkAutostart") := { val script = IO.read(target.value / "debian-test-0.1.0" / "DEBIAN" / "postinst") - assert(script.contains("""addService debian-test || echo "debian-test could not be registered" + assert( + script.contains("""addService debian-test || echo "debian-test could not be registered" |startService debian-test || echo "debian-test could not be started" - |""".stripMargin), "addService, startService post install commands missing or incorrect") + |""".stripMargin), + "addService, startService post install commands missing or incorrect" + ) () } TaskKey[Unit]("checkNoAutostart") := { val script = IO.read(target.value / "debian-test-0.1.0" / "DEBIAN" / "postinst") - assert(script.contains("""addService debian-test || echo "debian-test could not be registered" - |""".stripMargin), "addService post install commands missing or incorrect") + assert( + script.contains("""addService debian-test || echo "debian-test could not be registered" + |""".stripMargin), + "addService post install commands missing or incorrect" + ) () } diff --git a/src/sbt-test/debian/test-executableScriptName/src/main/scala/test/Main.scala b/src/sbt-test/debian/test-executableScriptName/src/main/scala/test/Main.scala index 6b4b11962..3feb58d4a 100644 --- a/src/sbt-test/debian/test-executableScriptName/src/main/scala/test/Main.scala +++ b/src/sbt-test/debian/test-executableScriptName/src/main/scala/test/Main.scala @@ -1,10 +1,8 @@ package test object Main { - def main (args: Array[String]): Unit = { - //server app imitation - while (true){ + def main(args: Array[String]): Unit = + // server app imitation + while (true) Thread.sleep(1000L) - } - } -} \ No newline at end of file +} diff --git a/src/sbt-test/debian/upstart-deb/build.sbt b/src/sbt-test/debian/upstart-deb/build.sbt index 8fc8ced5e..f9abaff2c 100644 --- a/src/sbt-test/debian/upstart-deb/build.sbt +++ b/src/sbt-test/debian/upstart-deb/build.sbt @@ -55,15 +55,21 @@ TaskKey[Unit]("checkStartupScript") := { TaskKey[Unit]("checkAutostart") := { val script = IO.read(target.value / "debian-test-0.1.0" / "DEBIAN" / "postinst") - assert(script.contains("""addService debian-test || echo "debian-test could not be registered" + assert( + script.contains("""addService debian-test || echo "debian-test could not be registered" |startService debian-test || echo "debian-test could not be started" - |""".stripMargin), "addService, startService post install commands missing or incorrect") + |""".stripMargin), + "addService, startService post install commands missing or incorrect" + ) () } TaskKey[Unit]("checkNoAutostart") := { val script = IO.read(target.value / "debian-test-0.1.0" / "DEBIAN" / "postinst") - assert(script.contains("""addService debian-test || echo "debian-test could not be registered" - |""".stripMargin), "addService post install commands missing or incorrect") + assert( + script.contains("""addService debian-test || echo "debian-test could not be registered" + |""".stripMargin), + "addService post install commands missing or incorrect" + ) () } diff --git a/src/sbt-test/docker/envVars/build.sbt b/src/sbt-test/docker/envVars/build.sbt index bec0a3872..e3f076a9c 100644 --- a/src/sbt-test/docker/envVars/build.sbt +++ b/src/sbt-test/docker/envVars/build.sbt @@ -6,7 +6,6 @@ version := "0.1.0" dockerEnvVars := Map("FOO" -> "bar", "FOO_BAR" -> "foo bar", "NUMBER" -> "123") - TaskKey[Unit]("checkDockerfile") := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") diff --git a/src/sbt-test/docker/file-permission/build.sbt b/src/sbt-test/docker/file-permission/build.sbt index d2f2f88cc..842a4f26b 100644 --- a/src/sbt-test/docker/file-permission/build.sbt +++ b/src/sbt-test/docker/file-permission/build.sbt @@ -13,11 +13,14 @@ lazy val root = (project in file(".")) checkDockerfileDefaults := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val lines = dockerfile.linesIterator.toList - assertEquals(lines.take(2), - """FROM fabric8/java-centos-openjdk8-jdk as stage0 - |LABEL snp-multi-stage="intermediate"""".stripMargin.linesIterator.toList) + assertEquals( + lines.take(2), + """FROM fabric8/java-centos-openjdk8-jdk AS stage0 + |LABEL snp-multi-stage="intermediate"""".stripMargin.linesIterator.toList + ) assert(lines(2).substring(0, 25) == "LABEL snp-multi-stage-id=") // random generated id is hard to test - assertEquals(lines.drop(3), + assertEquals( + lines.drop(3), """WORKDIR /opt/docker |COPY 2/opt /2/opt |COPY 4/opt /4/opt @@ -26,7 +29,7 @@ lazy val root = (project in file(".")) |RUN ["chmod", "-R", "u=rX,g=rX", "/4/opt/docker"] |RUN ["chmod", "u+x,g+x", "/4/opt/docker/bin/file-permission-test"] | - |FROM fabric8/java-centos-openjdk8-jdk as mainstage + |FROM fabric8/java-centos-openjdk8-jdk AS mainstage |USER root |RUN id -u demiourgos728 1>/dev/null 2>&1 || (( getent group 0 1>/dev/null 2>&1 || ( type groupadd 1>/dev/null 2>&1 && groupadd -g 0 root || addgroup -g 0 -S root )) && ( type useradd 1>/dev/null 2>&1 && useradd --system --create-home --uid 1001 --gid 0 demiourgos728 || adduser -S -u 1001 -G root demiourgos728 )) |WORKDIR /opt/docker @@ -34,14 +37,15 @@ lazy val root = (project in file(".")) |COPY --from=stage0 --chown=demiourgos728:root /4/opt/docker /opt/docker |USER 1001:0 |ENTRYPOINT ["/opt/docker/bin/file-permission-test"] - |CMD []""".stripMargin.linesIterator.toList) + |CMD []""".stripMargin.linesIterator.toList + ) }, - checkDockerfileWithStrategyNone := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val lines = dockerfile.linesIterator.toList - assertEquals(lines, - """FROM fabric8/java-centos-openjdk8-jdk as mainstage + assertEquals( + lines, + """FROM fabric8/java-centos-openjdk8-jdk AS mainstage |USER root |RUN id -u demiourgos728 1>/dev/null 2>&1 || (( getent group 0 1>/dev/null 2>&1 || ( type groupadd 1>/dev/null 2>&1 && groupadd -g 0 root || addgroup -g 0 -S root )) && ( type useradd 1>/dev/null 2>&1 && useradd --system --create-home --uid 1001 --gid 0 demiourgos728 || adduser -S -u 1001 -G root demiourgos728 )) |WORKDIR /opt/docker @@ -49,14 +53,15 @@ lazy val root = (project in file(".")) |COPY 4/opt /opt |USER 1001:0 |ENTRYPOINT ["/opt/docker/bin/file-permission-test"] - |CMD []""".stripMargin.linesIterator.toList) + |CMD []""".stripMargin.linesIterator.toList + ) }, - checkDockerfileWithStrategyNoneGid := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val lines = dockerfile.linesIterator.toList - assertEquals(lines, - """FROM fabric8/java-centos-openjdk8-jdk as mainstage + assertEquals( + lines, + """FROM fabric8/java-centos-openjdk8-jdk AS mainstage |USER root |RUN id -u demiourgos728 1>/dev/null 2>&1 || (( getent group 5000 1>/dev/null 2>&1 || ( type groupadd 1>/dev/null 2>&1 && groupadd -g 5000 sbt || addgroup -g 5000 -S sbt )) && ( type useradd 1>/dev/null 2>&1 && useradd --system --create-home --uid 1001 --gid 5000 demiourgos728 || adduser -S -u 1001 -G sbt demiourgos728 )) |WORKDIR /opt/docker @@ -64,14 +69,15 @@ lazy val root = (project in file(".")) |COPY 4/opt /opt |USER 1001:5000 |ENTRYPOINT ["/opt/docker/bin/file-permission-test"] - |CMD []""".stripMargin.linesIterator.toList) + |CMD []""".stripMargin.linesIterator.toList + ) }, - checkDockerfileWithStrategyRun := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val lines = dockerfile.linesIterator.toList - assertEquals(lines, - """FROM openjdk:8 as mainstage + assertEquals( + lines, + """FROM openjdk:8 AS mainstage |USER root |RUN id -u demiourgos728 1>/dev/null 2>&1 || (( getent group 0 1>/dev/null 2>&1 || ( type groupadd 1>/dev/null 2>&1 && groupadd -g 0 root || addgroup -g 0 -S root )) && ( type useradd 1>/dev/null 2>&1 && useradd --system --create-home --uid 1001 --gid 0 demiourgos728 || adduser -S -u 1001 -G root demiourgos728 )) |WORKDIR /opt/docker @@ -81,30 +87,34 @@ lazy val root = (project in file(".")) |RUN ["chmod", "u+x,g+x", "/opt/docker/bin/file-permission-test"] |USER 1001:0 |ENTRYPOINT ["/opt/docker/bin/file-permission-test"] - |CMD []""".stripMargin.linesIterator.toList) + |CMD []""".stripMargin.linesIterator.toList + ) }, - checkDockerfileWithStrategyCopyChown := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val lines = dockerfile.linesIterator.toList - assertEquals(lines, - """FROM fabric8/java-centos-openjdk8-jdk as mainstage + assertEquals( + lines, + """FROM fabric8/java-centos-openjdk8-jdk AS mainstage |WORKDIR /opt/docker |COPY --chown=daemon:root 2/opt /opt |COPY --chown=daemon:root 4/opt /opt |USER daemon |ENTRYPOINT ["/opt/docker/bin/file-permission-test"] - |CMD []""".stripMargin.linesIterator.toList) + |CMD []""".stripMargin.linesIterator.toList + ) }, - checkDockerfileWithWriteExecute := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val lines = dockerfile.linesIterator.toList - assertEquals(lines.take(2), - """FROM fabric8/java-centos-openjdk8-jdk as stage0 - |LABEL snp-multi-stage="intermediate"""".stripMargin.linesIterator.toList) + assertEquals( + lines.take(2), + """FROM fabric8/java-centos-openjdk8-jdk AS stage0 + |LABEL snp-multi-stage="intermediate"""".stripMargin.linesIterator.toList + ) assert(lines(2).substring(0, 25) == "LABEL snp-multi-stage-id=") // random generated id is hard to test - assertEquals(lines.drop(3), + assertEquals( + lines.drop(3), """WORKDIR /opt/docker |COPY 2/opt /2/opt |COPY 4/opt /4/opt @@ -113,7 +123,7 @@ lazy val root = (project in file(".")) |RUN ["chmod", "-R", "u=rwX,g=rwX", "/4/opt/docker"] |RUN ["chmod", "u+x,g+x", "/4/opt/docker/bin/file-permission-test"] | - |FROM fabric8/java-centos-openjdk8-jdk as mainstage + |FROM fabric8/java-centos-openjdk8-jdk AS mainstage |USER root |RUN id -u demiourgos728 1>/dev/null 2>&1 || (( getent group 0 1>/dev/null 2>&1 || ( type groupadd 1>/dev/null 2>&1 && groupadd -g 0 root || addgroup -g 0 -S root )) && ( type useradd 1>/dev/null 2>&1 && useradd --system --create-home --uid 1001 --gid 0 demiourgos728 || adduser -S -u 1001 -G root demiourgos728 )) |WORKDIR /opt/docker @@ -121,13 +131,16 @@ lazy val root = (project in file(".")) |COPY --from=stage0 --chown=demiourgos728:root /4/opt/docker /opt/docker |USER 1001:0 |ENTRYPOINT ["/opt/docker/bin/file-permission-test"] - |CMD []""".stripMargin.linesIterator.toList) + |CMD []""".stripMargin.linesIterator.toList + ) } ) def assertEquals(left: List[String], right: List[String]) = - assert(left == right, + assert( + left == right, "\n" + ((left zip right) flatMap { case (a: String, b: String) => if (a == b) Nil else List("- " + a, "+ " + b) - }).mkString("\n")) + }).mkString("\n") + ) diff --git a/src/sbt-test/docker/file-permission/changes/dockerversion.sbt b/src/sbt-test/docker/file-permission/changes/dockerversion.sbt index dad0195b4..043ecc17f 100644 --- a/src/sbt-test/docker/file-permission/changes/dockerversion.sbt +++ b/src/sbt-test/docker/file-permission/changes/dockerversion.sbt @@ -1,4 +1,4 @@ import com.typesafe.sbt.packager.docker._ dockerVersion := Some(DockerVersion(1, 13, 0, None)) -dockerApiVersion := Some(DockerApiVersion(1, 28)) \ No newline at end of file +dockerApiVersion := Some(DockerApiVersion(1, 28)) diff --git a/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt b/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt index e2d9592c0..5deaad93c 100644 --- a/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt +++ b/src/sbt-test/docker/file-permission/changes/strategy-copychown.sbt @@ -1,8 +1,8 @@ import com.typesafe.sbt.packager.docker._ dockerPermissionStrategy := DockerPermissionStrategy.CopyChown -dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" +dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" // opt-out of numeric USER -daemonUserUid in Docker := None -daemonUser in Docker := "daemon" +daemonUserUid in Docker := None +daemonUser in Docker := "daemon" diff --git a/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt b/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt index cf4c078a6..3a1d8bc8c 100644 --- a/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt +++ b/src/sbt-test/docker/file-permission/changes/strategy-none-gid.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.packager.docker._ dockerPermissionStrategy := DockerPermissionStrategy.None -dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" +dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" daemonGroupGid in Docker := Some("5000") -daemonGroup in Docker := "sbt" +daemonGroup in Docker := "sbt" diff --git a/src/sbt-test/docker/file-permission/changes/strategy-none.sbt b/src/sbt-test/docker/file-permission/changes/strategy-none.sbt index 0b08bfae0..73053dd4d 100644 --- a/src/sbt-test/docker/file-permission/changes/strategy-none.sbt +++ b/src/sbt-test/docker/file-permission/changes/strategy-none.sbt @@ -1,4 +1,4 @@ import com.typesafe.sbt.packager.docker._ dockerPermissionStrategy := DockerPermissionStrategy.None -dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" +dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" diff --git a/src/sbt-test/docker/file-permission/changes/write-execute.sbt b/src/sbt-test/docker/file-permission/changes/write-execute.sbt index d07d59c78..54a285821 100644 --- a/src/sbt-test/docker/file-permission/changes/write-execute.sbt +++ b/src/sbt-test/docker/file-permission/changes/write-execute.sbt @@ -1,5 +1,5 @@ import com.typesafe.sbt.packager.docker._ dockerPermissionStrategy := DockerPermissionStrategy.MultiStage -dockerChmodType := DockerChmodType.UserGroupWriteExecute -dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" +dockerChmodType := DockerChmodType.UserGroupWriteExecute +dockerBaseImage := "fabric8/java-centos-openjdk8-jdk" diff --git a/src/sbt-test/docker/jdk-versions/build.sbt b/src/sbt-test/docker/jdk-versions/build.sbt index acee20045..5832320a8 100644 --- a/src/sbt-test/docker/jdk-versions/build.sbt +++ b/src/sbt-test/docker/jdk-versions/build.sbt @@ -28,4 +28,3 @@ lazy val `jdk10` = project dockerBaseImage := "openjdk:10-jre", dockerBuildOptions := dockerBuildOptions.value ++ Seq("-t", "jdk-versions:10") ) - diff --git a/src/sbt-test/docker/jdk-versions/project/plugins.sbt b/src/sbt-test/docker/jdk-versions/project/plugins.sbt index 706674923..218f1a27d 100644 --- a/src/sbt-test/docker/jdk-versions/project/plugins.sbt +++ b/src/sbt-test/docker/jdk-versions/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % sys.props("project.version")) - diff --git a/src/sbt-test/docker/labels/build.sbt b/src/sbt-test/docker/labels/build.sbt index 4a7a0dddf..5b3497d05 100644 --- a/src/sbt-test/docker/labels/build.sbt +++ b/src/sbt-test/docker/labels/build.sbt @@ -6,7 +6,6 @@ version := "0.1.0" dockerLabels := Map("foo" -> "bar", "fooBar" -> "foo bar", "number" -> "123") - TaskKey[Unit]("checkDockerfile") := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") diff --git a/src/sbt-test/docker/test-busybox-create-user/build.sbt b/src/sbt-test/docker/test-busybox-create-user/build.sbt index 56663fb4b..1dbab3d03 100644 --- a/src/sbt-test/docker/test-busybox-create-user/build.sbt +++ b/src/sbt-test/docker/test-busybox-create-user/build.sbt @@ -1,4 +1,3 @@ - enablePlugins(JavaAppPackaging) name := "test-busybox-create-user" @@ -10,4 +9,4 @@ dockerBaseImage := "anapsix/alpine-java:8" daemonUserUid in Docker := Some("2000") daemonUser in Docker := "appuser" daemonGroupGid in Docker := Some("3000") -daemonGroup in Docker := "appgroup" \ No newline at end of file +daemonGroup in Docker := "appgroup" diff --git a/src/sbt-test/docker/test-layer-groups/build.sbt b/src/sbt-test/docker/test-layer-groups/build.sbt index 0943cc8ab..fce09329f 100644 --- a/src/sbt-test/docker/test-layer-groups/build.sbt +++ b/src/sbt-test/docker/test-layer-groups/build.sbt @@ -14,23 +14,29 @@ libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.30" TaskKey[Unit]("checkDockerfile") := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val copyLines = dockerfile.linesIterator.toList.filter(_.startsWith("COPY --from=stage0")) - assertEquals(copyLines, + assertEquals( + copyLines, """COPY --from=stage0 --chown=demiourgos728:root /2/opt/docker /opt/docker |COPY --from=stage0 --chown=demiourgos728:root /4/opt/docker /opt/docker |COPY --from=stage0 --chown=demiourgos728:root /54/opt/docker /opt/docker - |COPY --from=stage0 --chown=demiourgos728:root /opt/docker /opt/docker""".stripMargin.linesIterator.toList) + |COPY --from=stage0 --chown=demiourgos728:root /opt/docker /opt/docker""".stripMargin.linesIterator.toList + ) } TaskKey[Unit]("checkDockerfileWithNoLayers") := { val dockerfile = IO.read((stagingDirectory in Docker).value / "Dockerfile") val copyLines = dockerfile.linesIterator.toList.filter(_.startsWith("COPY --from=stage0")) - assertEquals(copyLines, - """COPY --from=stage0 --chown=demiourgos728:root /opt/docker /opt/docker""".stripMargin.linesIterator.toList) + assertEquals( + copyLines, + """COPY --from=stage0 --chown=demiourgos728:root /opt/docker /opt/docker""".stripMargin.linesIterator.toList + ) } def assertEquals(left: List[String], right: List[String]) = - assert(left == right, + assert( + left == right, "\n" + ((left zip right) flatMap { case (a: String, b: String) => if (a == b) Nil else List("- " + a, "+ " + b) - }).mkString("\n")) + }).mkString("\n") + ) diff --git a/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt b/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt index 39a267b0f..a272b5a6c 100644 --- a/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt +++ b/src/sbt-test/graalvm-native-image/docker-native-image/build.sbt @@ -2,4 +2,4 @@ enablePlugins(GraalVMNativeImagePlugin) name := "docker-test" version := "0.1.0" -graalVMNativeImageGraalVersion := Some("22.3.3") \ No newline at end of file +graalVMNativeImageGraalVersion := Some("22.3.3") diff --git a/src/sbt-test/graalvm-native-image/docker-native-image/src/main/scala/Main.scala b/src/sbt-test/graalvm-native-image/docker-native-image/src/main/scala/Main.scala index 43c2459f3..47fc1133f 100644 --- a/src/sbt-test/graalvm-native-image/docker-native-image/src/main/scala/Main.scala +++ b/src/sbt-test/graalvm-native-image/docker-native-image/src/main/scala/Main.scala @@ -1,5 +1,4 @@ object Main { - def main(args: Array[String]): Unit = { + def main(args: Array[String]): Unit = println("Hello Graal") - } } diff --git a/src/sbt-test/graalvm-native-image/simple-native-image/src/main/scala/Main.scala b/src/sbt-test/graalvm-native-image/simple-native-image/src/main/scala/Main.scala index 43c2459f3..47fc1133f 100644 --- a/src/sbt-test/graalvm-native-image/simple-native-image/src/main/scala/Main.scala +++ b/src/sbt-test/graalvm-native-image/simple-native-image/src/main/scala/Main.scala @@ -1,5 +1,4 @@ object Main { - def main(args: Array[String]): Unit = { + def main(args: Array[String]): Unit = println("Hello Graal") - } } diff --git a/src/sbt-test/jdkpackager/test-package-image/src/main/scala/ExampleApp.scala b/src/sbt-test/jdkpackager/test-package-image/src/main/scala/ExampleApp.scala index a1168ac9d..35be79af9 100644 --- a/src/sbt-test/jdkpackager/test-package-image/src/main/scala/ExampleApp.scala +++ b/src/sbt-test/jdkpackager/test-package-image/src/main/scala/ExampleApp.scala @@ -12,9 +12,8 @@ import scala.collection.JavaConversions._ /** Silly GUI app launcher. */ object ExampleApp { - def main(args: Array[String]): Unit = { + def main(args: Array[String]): Unit = Application.launch(classOf[ExampleApp], args: _*) - } } /** Silly GUI app. */ @@ -27,12 +26,9 @@ class ExampleApp extends Application { win.initOwner(stage) val args = getParameters.getRaw.mkString("\n") - val props = sys.props.toSeq.sortBy(_._1).map(p⇒s"${p._1}=${p._2}").mkString("\n") + val props = sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n") - val content = new TextArea(Seq( - "## Application Arguments", args, - "## System Properties", props - ).mkString("\n")) + val content = new TextArea(Seq("## Application Arguments", args, "## System Properties", props).mkString("\n")) content.setPrefHeight(400) win.setScene(new Scene(content)) win.sizeToScene() @@ -63,4 +59,3 @@ class ExampleApp extends Application { primaryStage.show() } } - diff --git a/src/sbt-test/jdkpackager/test-package-mappings/src/main/scala/ExampleApp.scala b/src/sbt-test/jdkpackager/test-package-mappings/src/main/scala/ExampleApp.scala index 62d4fd636..abd7c0eb4 100644 --- a/src/sbt-test/jdkpackager/test-package-mappings/src/main/scala/ExampleApp.scala +++ b/src/sbt-test/jdkpackager/test-package-mappings/src/main/scala/ExampleApp.scala @@ -9,12 +9,10 @@ import javafx.scene.paint.Color import javafx.scene.text.{Font, FontWeight, Text} import javafx.stage.{Modality, Stage, StageStyle} - /** Silly GUI app launcher. */ object ExampleApp { - def main(args: Array[String]): Unit = { + def main(args: Array[String]): Unit = Application.launch(classOf[ExampleApp], args: _*) - } } /** Silly GUI app. */ @@ -25,9 +23,7 @@ class ExampleApp extends Application { val win = new Stage(StageStyle.UTILITY) win.initModality(Modality.APPLICATION_MODAL) win.initOwner(stage) - val content = new TextArea( - sys.props.toSeq.sortBy(_._1).map(p⇒s"${p._1}=${p._2}").mkString("\n") - ) + val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n")) content.setPrefHeight(400) win.setScene(new Scene(content)) win.sizeToScene() @@ -58,4 +54,3 @@ class ExampleApp extends Application { primaryStage.show() } } - diff --git a/src/sbt-test/jdkpackager/test-package-minimal/src/main/scala/ExampleApp.scala b/src/sbt-test/jdkpackager/test-package-minimal/src/main/scala/ExampleApp.scala index 62d4fd636..abd7c0eb4 100644 --- a/src/sbt-test/jdkpackager/test-package-minimal/src/main/scala/ExampleApp.scala +++ b/src/sbt-test/jdkpackager/test-package-minimal/src/main/scala/ExampleApp.scala @@ -9,12 +9,10 @@ import javafx.scene.paint.Color import javafx.scene.text.{Font, FontWeight, Text} import javafx.stage.{Modality, Stage, StageStyle} - /** Silly GUI app launcher. */ object ExampleApp { - def main(args: Array[String]): Unit = { + def main(args: Array[String]): Unit = Application.launch(classOf[ExampleApp], args: _*) - } } /** Silly GUI app. */ @@ -25,9 +23,7 @@ class ExampleApp extends Application { val win = new Stage(StageStyle.UTILITY) win.initModality(Modality.APPLICATION_MODAL) win.initOwner(stage) - val content = new TextArea( - sys.props.toSeq.sortBy(_._1).map(p⇒s"${p._1}=${p._2}").mkString("\n") - ) + val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n")) content.setPrefHeight(400) win.setScene(new Scene(content)) win.sizeToScene() @@ -58,4 +54,3 @@ class ExampleApp extends Application { primaryStage.show() } } - diff --git a/src/sbt-test/jlink/test-jlink-minimal/build.sbt b/src/sbt-test/jlink/test-jlink-minimal/build.sbt index 19208b7db..9f8b6a3e2 100644 --- a/src/sbt-test/jlink/test-jlink-minimal/build.sbt +++ b/src/sbt-test/jlink/test-jlink-minimal/build.sbt @@ -3,12 +3,7 @@ import scala.sys.process.Process import com.typesafe.sbt.packager.Compat._ -enablePlugins( - JlinkPlugin, - ClasspathJarPlugin, - BashStartScriptPlugin, - BatStartScriptPlugin -) +enablePlugins(JlinkPlugin, ClasspathJarPlugin, BashStartScriptPlugin, BatStartScriptPlugin) // Exclude Scala to avoid linking additional modules autoScalaLibrary := false @@ -37,14 +32,13 @@ TaskKey[Unit]("runChecks") := { log.info(s"Produced image:\n$releaseInfo") // Run the application directly. - val classpathJar = (stageDir / "lib" / packageJavaClasspathJar.value.getName) - .getAbsolutePath + val classpathJar = (stageDir / "lib" / packageJavaClasspathJar.value.getName).getAbsolutePath run(javaExe, Seq("-cp", classpathJar, "JlinkTestApp")) // Make sure the scripts use the correct JVM val startScripts = (os match { case 'windows => makeBatScripts.value.map(_._2) - case _ => makeBashScripts.value.map(_._2) + case _ => makeBashScripts.value.map(_._2) }).map(s => (stageDir / s).getAbsolutePath) startScripts.foreach { script => diff --git a/src/sbt-test/jlink/test-jlink-misc/build.sbt b/src/sbt-test/jlink/test-jlink-misc/build.sbt index 31ae1a0ed..9b764d807 100644 --- a/src/sbt-test/jlink/test-jlink-misc/build.sbt +++ b/src/sbt-test/jlink/test-jlink-misc/build.sbt @@ -78,17 +78,13 @@ val issue1266 = project 1.to(300000).map(mkPath) }, logLevel in jlinkModules := Level.Error, - runChecks := jlinkBuildImage.value ) // Should fail for invalid jlink inputs val issue1284 = project .enablePlugins(JlinkPlugin) - .settings( - jlinkModules := List("no-such-module"), - runFailingChecks := jlinkBuildImage.value - ) + .settings(jlinkModules := List("no-such-module"), runFailingChecks := jlinkBuildImage.value) // We should be able to make the whole thing work for modules that depend // on automatic modules - at least by manually setting `jlinkModulePath`. @@ -110,7 +106,9 @@ val issue1293 = project // Use `paramaner` (and only it) as an automatic module jlinkModulePath := { // Get the full classpath with all the resolved dependencies. - fullClasspath.in(jlinkBuildImage).value + fullClasspath + .in(jlinkBuildImage) + .value // Find the ones that have `paranamer` as their artifact names. .filter { item => item.get(moduleID.key).exists { modId => diff --git a/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt b/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt index 794699b5d..b00ff4b18 100644 --- a/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt +++ b/src/sbt-test/jlink/test-jlink-missing-deps/build.sbt @@ -3,7 +3,6 @@ import scala.sys.process.Process import com.typesafe.sbt.packager.Compat._ - // Exclude Scala to simplify the test autoScalaLibrary in ThisBuild := false @@ -11,11 +10,11 @@ autoScalaLibrary in ThisBuild := false lazy val foo = project.dependsOn(bar % "provided") lazy val bar = project -lazy val withoutIgnore = project.dependsOn(foo) +lazy val withoutIgnore = project + .dependsOn(foo) .enablePlugins(JlinkPlugin) -lazy val withIgnore = project.dependsOn(foo) +lazy val withIgnore = project + .dependsOn(foo) .enablePlugins(JlinkPlugin) - .settings( - jlinkIgnoreMissingDependency := JlinkIgnore.only("foo" -> "bar") - ) + .settings(jlinkIgnoreMissingDependency := JlinkIgnore.only("foo" -> "bar")) diff --git a/src/sbt-test/rpm/path-override-rpm/build.sbt b/src/sbt-test/rpm/path-override-rpm/build.sbt index dd7c11886..35d0afb7d 100644 --- a/src/sbt-test/rpm/path-override-rpm/build.sbt +++ b/src/sbt-test/rpm/path-override-rpm/build.sbt @@ -31,10 +31,7 @@ TaskKey[Unit]("unzip") := { TaskKey[Unit]("checkInitFile") := { val initd = IO.read(baseDirectory.value / "etc" / "init.d" / "rpm-test") assert(initd contains "/opt/test/rpm-test", "defaultLinuxInstallLocation not overriden in init.d\n" + initd) - assert( - initd contains "/opt/test/log/rpm-test/$logfile", - "defaultLinuxLogsLocation not overriden in init.d\n" + initd - ) + assert(initd contains "/opt/test/log/rpm-test/$logfile", "defaultLinuxLogsLocation not overriden in init.d\n" + initd) streams.value.log.success("Successfully tested rpm-test file") () } diff --git a/src/sbt-test/rpm/path-override-rpm/src/main/scala/test/Main.scala b/src/sbt-test/rpm/path-override-rpm/src/main/scala/test/Main.scala index 6b4b11962..3feb58d4a 100644 --- a/src/sbt-test/rpm/path-override-rpm/src/main/scala/test/Main.scala +++ b/src/sbt-test/rpm/path-override-rpm/src/main/scala/test/Main.scala @@ -1,10 +1,8 @@ package test object Main { - def main (args: Array[String]): Unit = { - //server app imitation - while (true){ + def main(args: Array[String]): Unit = + // server app imitation + while (true) Thread.sleep(1000L) - } - } -} \ No newline at end of file +} diff --git a/src/sbt-test/rpm/scriptlets-override-rpm/src/main/scala/com/example/MainApp.scala b/src/sbt-test/rpm/scriptlets-override-rpm/src/main/scala/com/example/MainApp.scala index faa497b3e..be35d0be5 100644 --- a/src/sbt-test/rpm/scriptlets-override-rpm/src/main/scala/com/example/MainApp.scala +++ b/src/sbt-test/rpm/scriptlets-override-rpm/src/main/scala/com/example/MainApp.scala @@ -1,3 +1,3 @@ object MainApp extends App { - println("Hello World") + println("Hello World") } diff --git a/src/sbt-test/rpm/scriptlets-rpm/build.sbt b/src/sbt-test/rpm/scriptlets-rpm/build.sbt index e3618b94d..f667518f6 100644 --- a/src/sbt-test/rpm/scriptlets-rpm/build.sbt +++ b/src/sbt-test/rpm/scriptlets-rpm/build.sbt @@ -50,9 +50,9 @@ TaskKey[Unit]("checkRpmVersion") := { val rpmVersion = fullRpmVersion substring firstDigit streams.value.log.info("Found rpmVersion: " + rpmVersion) val (major, minor, patch) = rpmVersion.trim.split("\\.").map(_.toInt) match { - case Array(major) => (major, 0, 0) - case Array(major, minor) => (major, minor, 0) - case Array(major, minor, patch, _ *) => (major, minor, patch) + case Array(major) => (major, 0, 0) + case Array(major, minor) => (major, minor, 0) + case Array(major, minor, patch, _*) => (major, minor, patch) } assert(major >= 4, "RPM version must be greater than than 4.x.x. Is " + fullRpmVersion) () diff --git a/src/sbt-test/rpm/setarch-rpm/build.sbt b/src/sbt-test/rpm/setarch-rpm/build.sbt index 2cc6f4120..94dba6fc2 100644 --- a/src/sbt-test/rpm/setarch-rpm/build.sbt +++ b/src/sbt-test/rpm/setarch-rpm/build.sbt @@ -21,8 +21,8 @@ rpmSetarch := Some("i386") linuxPackageMappings := { val helloMapping = LinuxPackageMapping( - Seq(((resourceDirectory in Compile).value / "hello-32bit", "/usr/share/rpm-package/libexec/hello-32bit")) - ) withPerms "0755" + Seq(((resourceDirectory in Compile).value / "hello-32bit", "/usr/share/rpm-package/libexec/hello-32bit")) + ) withPerms "0755" linuxPackageMappings.value :+ helloMapping } diff --git a/src/sbt-test/rpm/symlink-rpm/build.sbt b/src/sbt-test/rpm/symlink-rpm/build.sbt index fadfeacdf..1c86c4bf5 100644 --- a/src/sbt-test/rpm/symlink-rpm/build.sbt +++ b/src/sbt-test/rpm/symlink-rpm/build.sbt @@ -17,14 +17,20 @@ rpmUrl := Some("http://github.com/sbt/sbt-native-packager") rpmLicense := Some("BSD") linuxPackageSymlinks := { - val helloSymlink = LinuxSymlink(((file(defaultLinuxInstallLocation.value) / (packageName in Linux).value / "lib") / "hello.link").toString, "/fake/hello.tx") + val helloSymlink = LinuxSymlink( + ((file(defaultLinuxInstallLocation.value) / (packageName in Linux).value / "lib") / "hello.link").toString, + "/fake/hello.tx" + ) Seq(helloSymlink) } TaskKey[Unit]("check-spec-file") := { val spec = IO.read(target.value / "rpm" / "SPECS" / "rpm-package.spec") streams.value.log.success(spec) - assert(spec contains "%attr(0644,root,root) /usr/share/rpm-package/lib/rpm-test.rpm-test-0.1.0.jar", "Wrong installation path") + assert( + spec contains "%attr(0644,root,root) /usr/share/rpm-package/lib/rpm-test.rpm-test-0.1.0.jar", + "Wrong installation path" + ) assert(spec contains "/usr/share/rpm-package/lib/hello.link", "Missing or incorrect symbolic link") streams.value.log.success("Successfully tested rpm-package file") () diff --git a/src/sbt-test/rpm/systemd-rpm/src/main/scala/test/Main.scala b/src/sbt-test/rpm/systemd-rpm/src/main/scala/test/Main.scala index 6b4b11962..3feb58d4a 100644 --- a/src/sbt-test/rpm/systemd-rpm/src/main/scala/test/Main.scala +++ b/src/sbt-test/rpm/systemd-rpm/src/main/scala/test/Main.scala @@ -1,10 +1,8 @@ package test object Main { - def main (args: Array[String]): Unit = { - //server app imitation - while (true){ + def main(args: Array[String]): Unit = + // server app imitation + while (true) Thread.sleep(1000L) - } - } -} \ No newline at end of file +} diff --git a/src/sbt-test/rpm/sysvinit-rpm/build.sbt b/src/sbt-test/rpm/sysvinit-rpm/build.sbt index 2b58ab488..3b5f217f1 100644 --- a/src/sbt-test/rpm/sysvinit-rpm/build.sbt +++ b/src/sbt-test/rpm/sysvinit-rpm/build.sbt @@ -21,7 +21,8 @@ mainClass in (Compile, run) := Some("com.example.MainApp") TaskKey[Unit]("unzipAndCheck") := { val rpmPath = Seq((packageBin in Rpm).value.getAbsolutePath) sys.process.Process("rpm2cpio", rpmPath) #| sys.process.Process("cpio -i --make-directories") ! streams.value.log - val scriptlets = sys.process.Process("rpm -qp --scripts " + (packageBin in Rpm).value.getAbsolutePath) !! streams.value.log + val scriptlets = + sys.process.Process("rpm -qp --scripts " + (packageBin in Rpm).value.getAbsolutePath) !! streams.value.log assert(scriptlets contains "addGroup rpm-test", "addGroup not present in \n" + scriptlets) assert(scriptlets contains "addUser rpm-test", "Incorrect useradd command in \n" + scriptlets) assert(scriptlets contains "deleteGroup rpm-test", "deleteGroup not present in \n" + scriptlets) diff --git a/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/App.scala b/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/App.scala index faa497b3e..be35d0be5 100644 --- a/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/App.scala +++ b/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/App.scala @@ -1,3 +1,3 @@ object MainApp extends App { - println("Hello World") + println("Hello World") } diff --git a/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/MainApp.scala b/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/MainApp.scala index e69de29bb..8b1378917 100644 --- a/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/MainApp.scala +++ b/src/sbt-test/rpm/sysvinit-rpm/src/main/scala/com/example/MainApp.scala @@ -0,0 +1 @@ + diff --git a/src/sbt-test/rpm/test-executableScriptName/build.sbt b/src/sbt-test/rpm/test-executableScriptName/build.sbt index 835ffa061..4282e13f8 100644 --- a/src/sbt-test/rpm/test-executableScriptName/build.sbt +++ b/src/sbt-test/rpm/test-executableScriptName/build.sbt @@ -47,10 +47,7 @@ TaskKey[Unit]("unzip") := { TaskKey[Unit]("checkStartupScript") := { val script = IO.read(file("etc/init.d/rpm-test")) - assert( - script contains "rpm-exec", - "SystemV script didn't contain correct executable filename 'rpm-exec' \n" + script - ) + assert(script contains "rpm-exec", "SystemV script didn't contain correct executable filename 'rpm-exec' \n" + script) assert( script contains """RUN_CMD="$exec >> /var/log/rpm-test/$logfile 2>&1 &"""", "SystemV script didn't contain default daemon log filename 'rpm-test.log' \n" + script diff --git a/src/sbt-test/rpm/test-executableScriptName/src/main/scala/test/Main.scala b/src/sbt-test/rpm/test-executableScriptName/src/main/scala/test/Main.scala index 6b4b11962..3feb58d4a 100644 --- a/src/sbt-test/rpm/test-executableScriptName/src/main/scala/test/Main.scala +++ b/src/sbt-test/rpm/test-executableScriptName/src/main/scala/test/Main.scala @@ -1,10 +1,8 @@ package test object Main { - def main (args: Array[String]): Unit = { - //server app imitation - while (true){ + def main(args: Array[String]): Unit = + // server app imitation + while (true) Thread.sleep(1000L) - } - } -} \ No newline at end of file +} diff --git a/src/sbt-test/universal/multiproject-classifiers/build.sbt b/src/sbt-test/universal/multiproject-classifiers/build.sbt index 9d8c42d88..cc6e8bf27 100644 --- a/src/sbt-test/universal/multiproject-classifiers/build.sbt +++ b/src/sbt-test/universal/multiproject-classifiers/build.sbt @@ -3,13 +3,17 @@ import com.typesafe.sbt.packager.Compat._ lazy val appVersion = "1.0" lazy val mySettings: Seq[Setting[_]] = - Seq(organization := "org.test", version := appVersion, TaskKey[Unit]("showFiles") := { - System.out.synchronized { - println("Files in [" + name.value + "]") - val files = (target.value / "universal/stage").**(AllPassFilter).get - files foreach println + Seq( + organization := "org.test", + version := appVersion, + TaskKey[Unit]("showFiles") := { + System.out.synchronized { + println("Files in [" + name.value + "]") + val files = (target.value / "universal/stage").**(AllPassFilter).get + files foreach println + } } - }) + ) lazy val Assets = config("assets") diff --git a/src/sbt-test/windows/app-home-var-expansion/build.sbt b/src/sbt-test/windows/app-home-var-expansion/build.sbt index 91fe9e61a..633f23964 100644 --- a/src/sbt-test/windows/app-home-var-expansion/build.sbt +++ b/src/sbt-test/windows/app-home-var-expansion/build.sbt @@ -12,5 +12,8 @@ TaskKey[Unit]("runCheck") := { val cwd = (stagingDirectory in Universal).value val cmd = Seq((cwd / "bin" / s"${packageName.value}.bat").getAbsolutePath) val configFile = (sys.process.Process(cmd, cwd).!!).replaceAll("\r\n", "") - assert(configFile.contains("""stage\bin\\\..\conf\production.conf"""), "Output didn't contain config file path: " + configFile) + assert( + configFile.contains("""stage\bin\\\..\conf\production.conf"""), + "Output didn't contain config file path: " + configFile + ) } diff --git a/src/sbt-test/windows/custom-wix/build.sbt b/src/sbt-test/windows/custom-wix/build.sbt index a4ee3fc17..401672dd2 100644 --- a/src/sbt-test/windows/custom-wix/build.sbt +++ b/src/sbt-test/windows/custom-wix/build.sbt @@ -8,7 +8,4 @@ wixFile in Windows := { sys.error("wixFile shouldn't have been called") } -wixFiles := List( - sourceDirectory.value / "wix" / "main.wsx", - sourceDirectory.value / "wix" / "ui.wsx" -) +wixFiles := List(sourceDirectory.value / "wix" / "main.wsx", sourceDirectory.value / "wix" / "ui.wsx") diff --git a/src/sbt-test/windows/dynamic-app-env-name/build.sbt b/src/sbt-test/windows/dynamic-app-env-name/build.sbt index 9d6288849..12c3019ad 100644 --- a/src/sbt-test/windows/dynamic-app-env-name/build.sbt +++ b/src/sbt-test/windows/dynamic-app-env-name/build.sbt @@ -17,5 +17,8 @@ TaskKey[Unit]("runCheck") := { val cwd = (stagingDirectory in Universal).value val cmd = Seq((cwd / "bin" / s"${packageName.value}.bat").getAbsolutePath) val configFile = (sys.process.Process(cmd, cwd).!!).replaceAll("\r\n", "") - assert(configFile.contains("""stage\bin\\\..\\conf\\app.config"""), "Output didn't contain config file path: " + configFile) + assert( + configFile.contains("""stage\bin\\\..\\conf\\app.config"""), + "Output didn't contain config file path: " + configFile + ) } diff --git a/src/sbt-test/windows/test-bat-template/build.sbt b/src/sbt-test/windows/test-bat-template/build.sbt index b04c91421..0bf68a545 100644 --- a/src/sbt-test/windows/test-bat-template/build.sbt +++ b/src/sbt-test/windows/test-bat-template/build.sbt @@ -48,11 +48,13 @@ TaskKey[Unit]("checkScript") := { d } def crlf2cr(txt: String) = txt.trim.replaceAll("\\\r\\\n", "\n") - def checkOutput(testName: String, - args: Seq[String], - expected: String, - env: Map[String, String] = Map.empty, - expectedRC: Int = 0) = { + def checkOutput( + testName: String, + args: Seq[String], + expected: String, + env: Map[String, String] = Map.empty, + expectedRC: Int = 0 + ) = { val pr = new StringBuilder() val logger = ProcessLogger((o: String) => pr.append(o + "\n"), (e: String) => pr.append("error < " + e + "\n")) val cmd = Seq("cmd", "/c", script.getAbsolutePath) ++ args @@ -127,7 +129,7 @@ TaskKey[Unit]("checkScript") := { ) // can't success include double-quote. arguments pass from Process(Seq("-Da=xx\"yy", "aa\"bb")) is parsed (%1="-Da", %2="xx\"yy aa\"bb") by cmd.exe ... - //checkOutput("include space and double-quote", + // checkOutput("include space and double-quote", // "-Dtest.hoge=aa\"bb xx\"yy", // "arg #0 is [xx\"yy]\nproperty(test.hoge) is [aa\"bb]\nvmarg #0 is [-Dtest.hoge=aa\"bb]\nSUCCESS!") diff --git a/src/sbt-test/windows/test-bat-template/src/main/scala/test/Test.scala b/src/sbt-test/windows/test-bat-template/src/main/scala/test/Test.scala index 74d10d0f9..848edeb68 100644 --- a/src/sbt-test/windows/test-bat-template/src/main/scala/test/Test.scala +++ b/src/sbt-test/windows/test-bat-template/src/main/scala/test/Test.scala @@ -4,14 +4,13 @@ import scala.collection.JavaConversions._ object Test extends App { override def main(args: Array[String]): Unit = { - for((x,i) <- args.zipWithIndex) println("arg #" + i + " is [" + x + "]") - for((k,v) <- System.getProperties if k.startsWith("test.")) println("property(" + k + ") is [" + v + "]") - if(System.getenv("show-vmargs") == "true"){ - for((x,i) <- java.lang.management.ManagementFactory.getRuntimeMXBean().getInputArguments().zipWithIndex){ + for ((x, i) <- args.zipWithIndex) println("arg #" + i + " is [" + x + "]") + for ((k, v) <- System.getProperties if k.startsWith("test.")) println("property(" + k + ") is [" + v + "]") + if (System.getenv("show-vmargs") == "true") { + for ((x, i) <- java.lang.management.ManagementFactory.getRuntimeMXBean().getInputArguments().zipWithIndex) println("vmarg #" + i + " is [" + x + "]") - } } - if(System.getenv("return-code") != null){ + if (System.getenv("return-code") != null) { println("FAILURE!") System.exit(System.getenv("return-code").toInt) } else { diff --git a/src/test/scala/com/typesafe/sbt/packager/FileUtilSpec.scala b/src/test/scala/com/typesafe/sbt/packager/FileUtilSpec.scala index 27a25efcd..51bbd7fb9 100644 --- a/src/test/scala/com/typesafe/sbt/packager/FileUtilSpec.scala +++ b/src/test/scala/com/typesafe/sbt/packager/FileUtilSpec.scala @@ -2,8 +2,10 @@ package com.typesafe.sbt.packager import org.scalatest._ import java.nio.file.attribute.PosixFilePermission._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class FileUtilSpec extends FlatSpec with Matchers { +class FileUtilSpec extends AnyFlatSpec with Matchers { "permissions" should "convert octal to symbolic correctly" taggedAs (LinuxTag, WindowsTag) in { permissions convert "0000" should be("---------") @@ -21,7 +23,15 @@ class FileUtilSpec extends FlatSpec with Matchers { val perm2 = permissions("0755") perm2 should not be (empty) - perm2 should contain only (OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ, GROUP_EXECUTE, OTHERS_READ, OTHERS_EXECUTE) + perm2 should contain only ( + OWNER_READ, + OWNER_WRITE, + OWNER_EXECUTE, + GROUP_READ, + GROUP_EXECUTE, + OTHERS_READ, + OTHERS_EXECUTE + ) } "oct" should "parse octal string and convert to an integer" taggedAs (LinuxTag, WindowsTag) in { diff --git a/src/test/scala/com/typesafe/sbt/packager/StartScriptMainClassConfigSpec.scala b/src/test/scala/com/typesafe/sbt/packager/StartScriptMainClassConfigSpec.scala index d9f7b35a2..8acbdb5ec 100644 --- a/src/test/scala/com/typesafe/sbt/packager/StartScriptMainClassConfigSpec.scala +++ b/src/test/scala/com/typesafe/sbt/packager/StartScriptMainClassConfigSpec.scala @@ -2,8 +2,10 @@ package com.typesafe.sbt.packager import com.typesafe.sbt.packager.archetypes.scripts._ import org.scalatest._ +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec -class StartScriptMainClassConfigSpec extends WordSpec with Matchers { +class StartScriptMainClassConfigSpec extends AnyWordSpec with Matchers { "StartScriptMainClassConfig" should { diff --git a/src/test/scala/com/typesafe/sbt/packager/archetypes/jlink/JlinkSpec.scala b/src/test/scala/com/typesafe/sbt/packager/archetypes/jlink/JlinkSpec.scala index e8845033e..39ef6416b 100644 --- a/src/test/scala/com/typesafe/sbt/packager/archetypes/jlink/JlinkSpec.scala +++ b/src/test/scala/com/typesafe/sbt/packager/archetypes/jlink/JlinkSpec.scala @@ -3,11 +3,12 @@ package com.typesafe.sbt.packager.archetypes.jlink import java.nio.charset.StandardCharsets import java.nio.file.{Files, Paths} -import org.scalatest.{FlatSpec, Matchers} import JlinkPlugin.Ignore.byPackagePrefix import JlinkPlugin.javaVersionPattern +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class JlinkSpec extends FlatSpec with Matchers { +class JlinkSpec extends AnyFlatSpec with Matchers { "Ignore.byPackagePrefix()" should "match as expected for sample examples" in { byPackagePrefix("" -> "")("foo" -> "bar") should be(true) diff --git a/src/test/scala/com/typesafe/sbt/packager/archetypes/scripts/ScriptUtilsTest.scala b/src/test/scala/com/typesafe/sbt/packager/archetypes/scripts/ScriptUtilsTest.scala index 275d08165..3262d6c56 100644 --- a/src/test/scala/com/typesafe/sbt/packager/archetypes/scripts/ScriptUtilsTest.scala +++ b/src/test/scala/com/typesafe/sbt/packager/archetypes/scripts/ScriptUtilsTest.scala @@ -1,8 +1,9 @@ package com.typesafe.sbt.packager.archetypes.scripts -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class ScriptUtilsTest extends FlatSpec with Matchers { +class ScriptUtilsTest extends AnyFlatSpec with Matchers { "toLowerCase()" should "convert regular names" in { ScriptUtils.toLowerCase("package.TestClass") should be("package.test-class") } diff --git a/src/test/scala/com/typesafe/sbt/packager/docker/DockerApiVersionSpec.scala b/src/test/scala/com/typesafe/sbt/packager/docker/DockerApiVersionSpec.scala index bf506b453..4054e05d9 100644 --- a/src/test/scala/com/typesafe/sbt/packager/docker/DockerApiVersionSpec.scala +++ b/src/test/scala/com/typesafe/sbt/packager/docker/DockerApiVersionSpec.scala @@ -1,8 +1,10 @@ package com.typesafe.sbt.packager.docker import org.scalatest._ +import org.scalatest.diagrams.Diagrams +import org.scalatest.flatspec.AnyFlatSpec -class DockerApiVersionSpec extends FlatSpec with DiagrammedAssertions { +class DockerApiVersionSpec extends AnyFlatSpec with Diagrams { "DockerApiVersion" should "parse 1.40" in { val v = DockerApiVersion.parse("1.40") assert(v == Some(DockerApiVersion(1, 40))) diff --git a/src/test/scala/com/typesafe/sbt/packager/docker/DockerVersionSpec.scala b/src/test/scala/com/typesafe/sbt/packager/docker/DockerVersionSpec.scala index 4e1421201..d68fa9961 100644 --- a/src/test/scala/com/typesafe/sbt/packager/docker/DockerVersionSpec.scala +++ b/src/test/scala/com/typesafe/sbt/packager/docker/DockerVersionSpec.scala @@ -1,8 +1,10 @@ package com.typesafe.sbt.packager.docker import org.scalatest._ +import org.scalatest.diagrams.Diagrams +import org.scalatest.flatspec.AnyFlatSpec -class DockerVersionSpec extends FlatSpec with DiagrammedAssertions { +class DockerVersionSpec extends AnyFlatSpec with Diagrams { "DockerVersion" should "parse 18.09.2" in { val v = DockerVersion.parse("18.09.2") assert(v == Some(DockerVersion(18, 9, 2, None))) diff --git a/src/test/scala/com/typesafe/sbt/packager/linux/LinuxMappingDSLSpec.scala b/src/test/scala/com/typesafe/sbt/packager/linux/LinuxMappingDSLSpec.scala index 64d1a9f7a..db4213b0d 100644 --- a/src/test/scala/com/typesafe/sbt/packager/linux/LinuxMappingDSLSpec.scala +++ b/src/test/scala/com/typesafe/sbt/packager/linux/LinuxMappingDSLSpec.scala @@ -2,9 +2,10 @@ package com.typesafe.sbt.packager.linux import java.io.File -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec -class LinuxMappingDSLSpec extends WordSpec with Matchers with LinuxMappingDSL { +class LinuxMappingDSLSpec extends AnyWordSpec with Matchers with LinuxMappingDSL { "The LinuxMappingDSL" should { diff --git a/src/test/scala/com/typesafe/sbt/packager/universal/ZipHelperSpec.scala b/src/test/scala/com/typesafe/sbt/packager/universal/ZipHelperSpec.scala index 97e8d9ade..eb2c9b80a 100644 --- a/src/test/scala/com/typesafe/sbt/packager/universal/ZipHelperSpec.scala +++ b/src/test/scala/com/typesafe/sbt/packager/universal/ZipHelperSpec.scala @@ -7,8 +7,10 @@ import java.io.File import java.nio.file.{Files, Path, Paths} import java.nio.file.attribute.PosixFilePermission._ import scala.collection.JavaConversions._ +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec -class ZipHelperSpec extends WordSpec with Matchers with BeforeAndAfterEach with BeforeAndAfterAll { +class ZipHelperSpec extends AnyWordSpec with Matchers with BeforeAndAfterEach with BeforeAndAfterAll { var tmp: Path = _ val toDelete = scala.collection.mutable.ListBuffer[Path]() @@ -181,7 +183,15 @@ class ZipHelperSpec extends WordSpec with Matchers with BeforeAndAfterEach with Files.setPosixFilePermissions(exec, permissions("0755")) val perms = Files getPosixFilePermissions exec - perms should contain only (OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ, GROUP_EXECUTE, OTHERS_READ, OTHERS_EXECUTE) + perms should contain only ( + OWNER_READ, + OWNER_WRITE, + OWNER_EXECUTE, + GROUP_READ, + GROUP_EXECUTE, + OTHERS_READ, + OTHERS_EXECUTE + ) zipper(List(exec.toFile -> "exec"), out.toFile) Files exists out should be(true) @@ -196,7 +206,15 @@ class ZipHelperSpec extends WordSpec with Matchers with BeforeAndAfterEach with // checking permissions val unzippedPerms = Files getPosixFilePermissions unzipped - unzippedPerms should contain only (OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ, GROUP_EXECUTE, OTHERS_READ, OTHERS_EXECUTE) + unzippedPerms should contain only ( + OWNER_READ, + OWNER_WRITE, + OWNER_EXECUTE, + GROUP_READ, + GROUP_EXECUTE, + OTHERS_READ, + OTHERS_EXECUTE + ) } } diff --git a/test-project-docker/project/plugins.sbt b/test-project-docker/project/plugins.sbt index 1741fca94..328a10921 100644 --- a/test-project-docker/project/plugins.sbt +++ b/test-project-docker/project/plugins.sbt @@ -1,4 +1,4 @@ -lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") +lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") dependsOn(packager) // needs to be added for the docker spotify client diff --git a/test-project-docker/project/project/plugins.sbt b/test-project-docker/project/project/plugins.sbt index f79b7cb26..3177d1461 100644 --- a/test-project-docker/project/project/plugins.sbt +++ b/test-project-docker/project/project/plugins.sbt @@ -2,4 +2,4 @@ // [error] Runtime reference to undefined setting: // [error] test-project-simple-build/sbt:scalafmtOnCompile from */*:onLoad ((com.lucidchart.sbt.scalafmt.ScalafmtSbtPlugin.globalSettings) ScalafmtSbtPlugin.scala:16) -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") \ No newline at end of file +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") diff --git a/test-project-jdkpackager/project/plugins.sbt b/test-project-jdkpackager/project/plugins.sbt index f7551a06f..555e29cf2 100644 --- a/test-project-jdkpackager/project/plugins.sbt +++ b/test-project-jdkpackager/project/plugins.sbt @@ -1,2 +1,2 @@ -lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") +lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") dependsOn(packager) diff --git a/test-project-jdkpackager/project/project/plugins.sbt b/test-project-jdkpackager/project/project/plugins.sbt index f79b7cb26..3177d1461 100644 --- a/test-project-jdkpackager/project/project/plugins.sbt +++ b/test-project-jdkpackager/project/project/plugins.sbt @@ -2,4 +2,4 @@ // [error] Runtime reference to undefined setting: // [error] test-project-simple-build/sbt:scalafmtOnCompile from */*:onLoad ((com.lucidchart.sbt.scalafmt.ScalafmtSbtPlugin.globalSettings) ScalafmtSbtPlugin.scala:16) -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") \ No newline at end of file +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") diff --git a/test-project-jdkpackager/src/main/scala/ExampleApp.scala b/test-project-jdkpackager/src/main/scala/ExampleApp.scala index 62d4fd636..abd7c0eb4 100644 --- a/test-project-jdkpackager/src/main/scala/ExampleApp.scala +++ b/test-project-jdkpackager/src/main/scala/ExampleApp.scala @@ -9,12 +9,10 @@ import javafx.scene.paint.Color import javafx.scene.text.{Font, FontWeight, Text} import javafx.stage.{Modality, Stage, StageStyle} - /** Silly GUI app launcher. */ object ExampleApp { - def main(args: Array[String]): Unit = { + def main(args: Array[String]): Unit = Application.launch(classOf[ExampleApp], args: _*) - } } /** Silly GUI app. */ @@ -25,9 +23,7 @@ class ExampleApp extends Application { val win = new Stage(StageStyle.UTILITY) win.initModality(Modality.APPLICATION_MODAL) win.initOwner(stage) - val content = new TextArea( - sys.props.toSeq.sortBy(_._1).map(p⇒s"${p._1}=${p._2}").mkString("\n") - ) + val content = new TextArea(sys.props.toSeq.sortBy(_._1).map(p ⇒ s"${p._1}=${p._2}").mkString("\n")) content.setPrefHeight(400) win.setScene(new Scene(content)) win.sizeToScene() @@ -58,4 +54,3 @@ class ExampleApp extends Application { primaryStage.show() } } - diff --git a/test-project-simple/build.sbt b/test-project-simple/build.sbt index fa815ba67..b9683772d 100644 --- a/test-project-simple/build.sbt +++ b/test-project-simple/build.sbt @@ -25,4 +25,4 @@ maintainer in Universal := "" mappings in Universal ++= Seq( (baseDirectory.value / "foo.txt") -> "foo.txt", (baseDirectory.value / "bar.txt") -> "bar.txt" -) \ No newline at end of file +) diff --git a/test-project-simple/project/plugins.sbt b/test-project-simple/project/plugins.sbt index 253cf135c..1ed2a7463 100644 --- a/test-project-simple/project/plugins.sbt +++ b/test-project-simple/project/plugins.sbt @@ -1,4 +1,4 @@ -lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") +lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") dependsOn(packager) libraryDependencies += "org.vafer" % "jdeb" % "1.3" artifacts (Artifact("jdeb", "jar", "jar")) diff --git a/test-project-simple/project/project/plugins.sbt b/test-project-simple/project/project/plugins.sbt index f79b7cb26..3177d1461 100644 --- a/test-project-simple/project/project/plugins.sbt +++ b/test-project-simple/project/project/plugins.sbt @@ -2,4 +2,4 @@ // [error] Runtime reference to undefined setting: // [error] test-project-simple-build/sbt:scalafmtOnCompile from */*:onLoad ((com.lucidchart.sbt.scalafmt.ScalafmtSbtPlugin.globalSettings) ScalafmtSbtPlugin.scala:16) -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") \ No newline at end of file +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") diff --git a/test-project-simple/src/main/scala/ExampleApp.scala b/test-project-simple/src/main/scala/ExampleApp.scala index 71f696666..dbf45b436 100644 --- a/test-project-simple/src/main/scala/ExampleApp.scala +++ b/test-project-simple/src/main/scala/ExampleApp.scala @@ -11,4 +11,4 @@ object ExampleApp extends App { Thread sleep 5000 } -} \ No newline at end of file +} diff --git a/test-project-windows/build.sbt b/test-project-windows/build.sbt index 1b180929e..7b6f1e6c0 100644 --- a/test-project-windows/build.sbt +++ b/test-project-windows/build.sbt @@ -6,7 +6,6 @@ mainClass in Compile := Some("ExampleApp") enablePlugins(JavaAppPackaging) - maintainer := "some-company " packageSummary := "some application" packageDescription := """ Some useful description here """ @@ -17,7 +16,6 @@ wixProductUpgradeId := "4552fb0e-e257-4dbd-9ecb-dba9dbacf425" wixMajorVersion := 3 lightOptions := Seq("-ext", "WixUiExtension") - // these settings are conflicting javaOptions in Universal ++= Seq("-J-Xmx64m", "-J-Xms64m", "-jvm-debug 12345") diff --git a/test-project-windows/project/plugins.sbt b/test-project-windows/project/plugins.sbt index f7551a06f..555e29cf2 100644 --- a/test-project-windows/project/plugins.sbt +++ b/test-project-windows/project/plugins.sbt @@ -1,2 +1,2 @@ -lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") +lazy val packager = ProjectRef(file("../.."), "sbt-native-packager") dependsOn(packager) diff --git a/test-project-windows/project/project/plugins.sbt b/test-project-windows/project/project/plugins.sbt index f79b7cb26..3177d1461 100644 --- a/test-project-windows/project/project/plugins.sbt +++ b/test-project-windows/project/project/plugins.sbt @@ -2,4 +2,4 @@ // [error] Runtime reference to undefined setting: // [error] test-project-simple-build/sbt:scalafmtOnCompile from */*:onLoad ((com.lucidchart.sbt.scalafmt.ScalafmtSbtPlugin.globalSettings) ScalafmtSbtPlugin.scala:16) -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") \ No newline at end of file +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") diff --git a/test-project-windows/src/main/scala/ExampleApp.scala b/test-project-windows/src/main/scala/ExampleApp.scala index 1985f5338..641d95286 100644 --- a/test-project-windows/src/main/scala/ExampleApp.scala +++ b/test-project-windows/src/main/scala/ExampleApp.scala @@ -16,7 +16,6 @@ object ExampleApp extends App { } case class HelloWorld(i: Int) extends Runnable { - def run(): Unit = { + def run(): Unit = println(s"[$i] Hello, world!") - } -} \ No newline at end of file +}