Skip to content

Commit

Permalink
remove even more parenthesis
Browse files Browse the repository at this point in the history
  • Loading branch information
jtjeferreira committed Oct 11, 2024
1 parent b2dd90c commit b2e5e10
Show file tree
Hide file tree
Showing 57 changed files with 113 additions and 113 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ object GraalVMNativeImagePlugin extends AutoPlugin {
* This can be used to build a custom build image starting from a custom base image. Can be used like so:
*
* ```
* (GraalVMNativeImage / containerBuildImage) := generateContainerBuildImage("my-docker-hub-username/my-graalvm").value
* GraalVMNativeImage / containerBuildImage := generateContainerBuildImage("my-docker-hub-username/my-graalvm").value
* ```
*
* The passed in docker image must have GraalVM installed and on the PATH, including the gu utility.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ object JDKPackagerAntHelper {
sys.error(
"Please set key `JDKPackager / antPackagerTasks` to `ant-javafx.jar` path, " +
"which should be found in the `lib` directory of the Oracle JDK 8 installation. For example (Windows):\n" +
"""(JDKPackager / antPackagerTasks) := Some(file("C:\\Program Files\\Java\\jdk1.8.0_45\\lib\\ant-javafx.jar"))"""
"""JDKPackager / antPackagerTasks := Some(file("C:\\Program Files\\Java\\jdk1.8.0_45\\lib\\ant-javafx.jar"))"""
)

val taskClassPath = antTaskLib.get +: antExtraClasspath
Expand Down
8 changes: 4 additions & 4 deletions src/sbt-test/debian/daemon-group-gid-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging, UpstartPlugin)

(Linux / daemonUser) := "daemonuser"
(Linux / daemonGroup) := "daemongroup"
(Linux / daemonGroupGid) := Some("25000")
Linux / daemonUser := "daemonuser"
Linux / daemonGroup := "daemongroup"
Linux / daemonGroupGid := Some("25000")

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/debian/daemon-user-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
enablePlugins(JavaServerAppPackaging)

(Linux / daemonUser) := "daemonuser"
(Linux / daemonGroup) := "daemongroup"
Linux / daemonUser := "daemonuser"
Linux / daemonGroup := "daemongroup"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
8 changes: 4 additions & 4 deletions src/sbt-test/debian/daemon-user-homedir-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging)

(Linux / daemonUser) := "daemonuser"
(Linux / daemonGroup) := "daemongroup"
(Linux / daemonHome) := "/var/lib/customdaemonhome"
Linux / daemonUser := "daemonuser"
Linux / daemonGroup := "daemongroup"
Linux / daemonHome := "/var/lib/customdaemonhome"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
8 changes: 4 additions & 4 deletions src/sbt-test/debian/daemon-user-shell-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging)

(Linux / daemonUser) := "daemonuser"
(Linux / daemonGroup) := "daemongroup"
(Linux / daemonShell) := "/bin/bash"
Linux / daemonUser := "daemonuser"
Linux / daemonGroup := "daemongroup"
Linux / daemonShell := "/bin/bash"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
8 changes: 4 additions & 4 deletions src/sbt-test/debian/daemon-user-uid-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging)

(Linux / daemonUser) := "daemonuser"
(Linux / daemonUserUid) := Some("20000")
(Linux / daemonGroup) := "daemongroup"
Linux / daemonUser := "daemonuser"
Linux / daemonUserUid := Some("20000")
Linux / daemonGroup := "daemongroup"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/debian/gen-changes/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)"

Debian / debianPackageRecommends += "git"

(Debian / debianChangelog) := Some(file("debian/changelog"))
Debian / debianChangelog := Some(file("debian/changelog"))
2 changes: 1 addition & 1 deletion src/sbt-test/debian/jdeb-conflicts/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packageSummary := "Test debian package"
packageDescription := """A fun package description of our software,
with multiple lines."""

(Debian / debianPackageConflicts) := Seq("debian-test-package")
Debian / debianPackageConflicts := Seq("debian-test-package")

TaskKey[Unit]("checkConflicts") := {
val extracted = target.value / "extracted"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/debian/jdeb-dependencies/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packageSummary := "Test debian package"
packageDescription := """A fun package description of our software,
with multiple lines."""

(Debian / debianPackageDependencies) := Seq()
Debian / debianPackageDependencies := Seq()

TaskKey[Unit]("checkDependencies") := {
val extracted = target.value / "extracted"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/debian/jdeb-provides/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packageSummary := "Test debian package"
packageDescription := """A fun package description of our software,
with multiple lines."""

(Debian / debianPackageProvides) := Seq("debian-test-package")
Debian / debianPackageProvides := Seq("debian-test-package")

TaskKey[Unit]("checkProvides") := {
val extracted = target.value / "extracted"
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/debian/log-directory/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
enablePlugins(JavaServerAppPackaging)

(Debian / daemonUser) := "root"
Debian / daemonUser := "root"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/debian/native-build-compress/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
enablePlugins(DebianPlugin)

(Debian / debianNativeBuildOptions) := Nil
Debian / debianNativeBuildOptions := Nil

maintainer := "Maintainer <[email protected]>"

Expand Down
8 changes: 4 additions & 4 deletions src/sbt-test/debian/override-control-files/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
enablePlugins(JavaServerAppPackaging, UpstartPlugin)

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"

Expand All @@ -10,16 +10,16 @@ maintainer := "Josh Suereth <[email protected]>"

packageSummary := "Test debian package"

(Linux / daemonUser) := "root"
Linux / daemonUser := "root"

(Linux / daemonGroup) := "root"
Linux / daemonGroup := "root"

packageDescription := """A fun package description of our software,
with multiple lines."""

// add this to override all preexisting settings
import DebianConstants._
(Debian / maintainerScripts) := maintainerScriptsFromDirectory(
Debian / maintainerScripts := maintainerScriptsFromDirectory(
sourceDirectory.value / DebianSource / DebianMaintainerScripts,
Seq(Preinst, Postinst, Prerm, Postrm)
)
Expand Down
8 changes: 4 additions & 4 deletions src/sbt-test/debian/override-etc-default/build.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
enablePlugins(JavaServerAppPackaging, JDebPackaging, UpstartPlugin)

// TODO change this after #437 is fixed
(Linux / daemonUser) := "root"
Linux / daemonUser := "root"

(Linux / daemonGroup) := "app-group"
Linux / daemonGroup := "app-group"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"

(Debian / name) := "debian-test"
Debian / name := "debian-test"

version := "0.1.0"

Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/debian/override-loader-functions/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemdPlugin)

// TODO change this after #437 is fixed
(Linux / daemonUser) := "root"
(Linux / daemonGroup) := "app-group"
Linux / daemonUser := "root"
Linux / daemonGroup := "app-group"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/debian/override-start-script-systemd/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemdPlugin)

// TODO change this after #437 is fixed
(Linux / daemonUser) := "root"
(Linux / daemonGroup) := "app-group"
Linux / daemonUser := "root"
Linux / daemonGroup := "app-group"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/debian/override-start-script-systemv/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemVPlugin)

// TODO change this after #437 is fixed
(Linux / daemonUser) := "root"
(Linux / daemonGroup) := "app-group"
Linux / daemonUser := "root"
Linux / daemonGroup := "app-group"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/debian/override-start-script-upstart/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging, JDebPackaging, UpstartPlugin)

// TODO change this after #437 is fixed
(Linux / daemonUser) := "root"
(Linux / daemonGroup) := "app-group"
Linux / daemonUser := "root"
Linux / daemonGroup := "app-group"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/debian/systemd-deb/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ packageSummary := "Test debian package"
packageDescription := """A fun package description of our software,
with multiple lines."""

(Debian / requiredStartFacilities) := Some("network.target")
Debian / requiredStartFacilities := Some("network.target")

(Linux / daemonUser) := "testuser"
Linux / daemonUser := "testuser"

Debian / systemdSuccessExitStatus += "1"

Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/debian/sysvinit-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
enablePlugins(JavaServerAppPackaging, SystemVPlugin)

(Debian / daemonUser) := "root"
Debian / daemonUser := "root"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"

Expand All @@ -17,7 +17,7 @@ packageDescription := """A fun package description of our software,

requiredStartFacilities := Some("$test-service")

(Debian / requiredStartFacilities) := Some("$test-deb-service")
Debian / requiredStartFacilities := Some("$test-deb-service")

daemonStdoutLogFile := Some("test.log")

Expand Down
10 changes: 5 additions & 5 deletions src/sbt-test/debian/sysvinit-stoptimeouts-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
enablePlugins(JavaServerAppPackaging, SystemVPlugin)

(Debian / daemonUser) := "root"
Debian / daemonUser := "root"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"

Expand All @@ -17,11 +17,11 @@ packageDescription := """A fun package description of our software,

requiredStartFacilities := Some("$test-service")

(Debian / requiredStartFacilities) := Some("$test-deb-service")
Debian / requiredStartFacilities := Some("$test-deb-service")

(Debian / termTimeout) := 10
Debian / termTimeout := 10

(Debian / killTimeout) := 20
Debian / killTimeout := 20

TaskKey[Unit]("checkControlFiles") := {
val header = "#!/bin/sh"
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/debian/test-mapping/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ enablePlugins(DebianPlugin)

name := "debian-test"

(Debian / name) := "debian-test-override"
Debian / name := "debian-test-override"

(Linux / packageName) := "debian-test-package"
Linux / packageName := "debian-test-package"

version := "0.1.0"

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/debian/test-packageName/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ enablePlugins(JavaServerAppPackaging)

name := "debian-test"

(Debian / name) := "debian-test-override"
Debian / name := "debian-test-override"

(Linux / packageName) := "debian-test-package"
Linux / packageName := "debian-test-package"

version := "0.1.0"

Expand Down
10 changes: 5 additions & 5 deletions src/sbt-test/debian/upstart-deb-facilities/build.sbt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
enablePlugins(JavaServerAppPackaging, UpstartPlugin)

(Debian / daemonUser) := "root"
Debian / daemonUser := "root"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"

(Debian / name) := "debian-test"
Debian / name := "debian-test"

version := "0.1.0"

maintainer := "Josh Suereth <[email protected]>"

packageSummary := "Test debian package"

(Debian / requiredStartFacilities) := Some("[networking]")
Debian / requiredStartFacilities := Some("[networking]")

(Debian / requiredStopFacilities) := Some("[networking]")
Debian / requiredStopFacilities := Some("[networking]")

packageDescription := """A fun package description of our software,
with multiple lines."""
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/debian/upstart-deb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
enablePlugins(JavaServerAppPackaging, UpstartPlugin)

// TODO change this after #437 is fixed
(Linux / daemonUser) := "root"
(Linux / daemonGroup) := "app-group"
Linux / daemonUser := "root"
Linux / daemonGroup := "app-group"

(Compile / mainClass) := Some("empty")
Compile / mainClass := Some("empty")

name := "debian-test"
version := "0.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ dockerPermissionStrategy := DockerPermissionStrategy.CopyChown
dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"

// opt-out of numeric USER
(Docker / daemonUserUid) := None
(Docker / daemonUser) := "daemon"
Docker / daemonUserUid := None
Docker / daemonUser := "daemon"
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import com.typesafe.sbt.packager.docker._
dockerPermissionStrategy := DockerPermissionStrategy.None
dockerBaseImage := "fabric8/java-centos-openjdk8-jdk"

(Docker / daemonGroupGid) := Some("5000")
(Docker / daemonGroup) := "sbt"
Docker / daemonGroupGid := Some("5000")
Docker / daemonGroup := "sbt"
8 changes: 4 additions & 4 deletions src/sbt-test/docker/test-busybox-create-user/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version := "0.1.0"

maintainer := "Boris Capitanu <[email protected]>"
dockerBaseImage := "anapsix/alpine-java:8"
(Docker / daemonUserUid) := Some("2000")
(Docker / daemonUser) := "appuser"
(Docker / daemonGroupGid) := Some("3000")
(Docker / daemonGroup) := "appgroup"
Docker / daemonUserUid := Some("2000")
Docker / daemonUser := "appuser"
Docker / daemonGroupGid := Some("3000")
Docker / daemonGroup := "appgroup"
Loading

0 comments on commit b2e5e10

Please sign in to comment.