From b2dd90c473308a15c097044960983d19b4f4ab7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Fri, 11 Oct 2024 00:51:36 +0100 Subject: [PATCH] remove more parenthesis --- src/sbt-test/bash/absolute-path-in-bash/build.sbt | 2 +- src/sbt-test/bash/java-home-var-expansion/build.sbt | 2 +- src/sbt-test/bash/memory-settings/build.sbt | 2 +- src/sbt-test/debian/gen-changes/build.sbt | 4 ++-- src/sbt-test/debian/java-app-archetype/build.sbt | 4 ++-- src/sbt-test/debian/jdeb-dir-mappings/build.sbt | 8 ++++---- src/sbt-test/debian/jdeb-script-replacements/build.sbt | 4 ++-- src/sbt-test/debian/simple-deb/build.sbt | 8 ++++---- src/sbt-test/debian/simple-jdeb/build.sbt | 8 ++++---- src/sbt-test/debian/systemd-deb/build.sbt | 2 +- src/sbt-test/debian/test-executableScriptName/build.sbt | 4 ++-- src/sbt-test/debian/test-mapping-helpers/build.sbt | 6 +++--- src/sbt-test/debian/test-mapping/build.sbt | 4 ++-- src/sbt-test/debian/test-packageName/build.sbt | 4 ++-- src/sbt-test/docker/build-command/build.sbt | 2 +- src/sbt-test/docker/test-layer-groups/build.sbt | 2 +- src/sbt-test/jdkpackager/test-package-mappings/build.sbt | 4 ++-- src/sbt-test/jlink/test-jlink-misc/build.sbt | 4 ++-- src/sbt-test/universal/absolute-path/build.sbt | 4 ++-- .../universal/application-ini-from-javaoptions/build.sbt | 2 +- src/sbt-test/universal/test-mapping-helpers/build.sbt | 6 +++--- src/sbt-test/windows/absolute-path-in-bat/build.sbt | 2 +- src/sbt-test/windows/memory-settings/build.sbt | 2 +- src/sphinx/formats/universal.rst | 2 +- 24 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/sbt-test/bash/absolute-path-in-bash/build.sbt b/src/sbt-test/bash/absolute-path-in-bash/build.sbt index cbd928d51..b1453e8bb 100644 --- a/src/sbt-test/bash/absolute-path-in-bash/build.sbt +++ b/src/sbt-test/bash/absolute-path-in-bash/build.sbt @@ -4,7 +4,7 @@ name := "absolute-path-in-bash" version := "0.1.0" -(bashScriptDefines / scriptClasspath) ++= Seq("/dummy/absolute/path", "relative/path") +bashScriptDefines / scriptClasspath ++= Seq("/dummy/absolute/path", "relative/path") TaskKey[Unit]("runCheck") := { val dir = (Universal / stagingDirectory).value diff --git a/src/sbt-test/bash/java-home-var-expansion/build.sbt b/src/sbt-test/bash/java-home-var-expansion/build.sbt index 0517a8f2e..d106ba650 100644 --- a/src/sbt-test/bash/java-home-var-expansion/build.sbt +++ b/src/sbt-test/bash/java-home-var-expansion/build.sbt @@ -6,7 +6,7 @@ name := "java-home-override" version := "0.1.0" -(Universal / javaOptions) ++= Seq("-java-home ${app_home}/../jre") +Universal / javaOptions ++= Seq("-java-home ${app_home}/../jre") TaskKey[Unit]("runCheck") := { val cwd = (Universal / stagingDirectory).value diff --git a/src/sbt-test/bash/memory-settings/build.sbt b/src/sbt-test/bash/memory-settings/build.sbt index 1a0c24f5b..e64f3b293 100644 --- a/src/sbt-test/bash/memory-settings/build.sbt +++ b/src/sbt-test/bash/memory-settings/build.sbt @@ -6,7 +6,7 @@ name := "simple-app" version := "0.1.0" -(Universal / javaOptions) ++= Seq("-J-Xmx64m", "-J-Xms64m") +Universal / javaOptions ++= Seq("-J-Xmx64m", "-J-Xms64m") TaskKey[Unit]("jvmoptsCheck") := { val jvmopts = (Universal / stagingDirectory).value / "conf" / "application.ini" diff --git a/src/sbt-test/debian/gen-changes/build.sbt b/src/sbt-test/debian/gen-changes/build.sbt index 4c71e2848..feae5c547 100644 --- a/src/sbt-test/debian/gen-changes/build.sbt +++ b/src/sbt-test/debian/gen-changes/build.sbt @@ -11,8 +11,8 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" (Debian / debianChangelog) := Some(file("debian/changelog")) diff --git a/src/sbt-test/debian/java-app-archetype/build.sbt b/src/sbt-test/debian/java-app-archetype/build.sbt index 9cf201b1a..35cc8471f 100644 --- a/src/sbt-test/debian/java-app-archetype/build.sbt +++ b/src/sbt-test/debian/java-app-archetype/build.sbt @@ -13,9 +13,9 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" TaskKey[Unit]("checkScript") := { val dir = (Universal / stagingDirectory).value diff --git a/src/sbt-test/debian/jdeb-dir-mappings/build.sbt b/src/sbt-test/debian/jdeb-dir-mappings/build.sbt index 970a5c2e1..5c1a2172d 100644 --- a/src/sbt-test/debian/jdeb-dir-mappings/build.sbt +++ b/src/sbt-test/debian/jdeb-dir-mappings/build.sbt @@ -11,15 +11,15 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" -(Debian / linuxPackageMappings) += packageDirectoryAndContentsMapping( +Debian / linuxPackageMappings += packageDirectoryAndContentsMapping( (baseDirectory.value / "src" / "resources" / "conf") -> "/usr/share/conf" ) -(Debian / linuxPackageMappings) += packageDirectoryAndContentsMapping( +Debian / linuxPackageMappings += packageDirectoryAndContentsMapping( (baseDirectory.value / "src" / "resources" / "empty") -> "/var/empty" ) diff --git a/src/sbt-test/debian/jdeb-script-replacements/build.sbt b/src/sbt-test/debian/jdeb-script-replacements/build.sbt index 994029806..3d18a59ad 100644 --- a/src/sbt-test/debian/jdeb-script-replacements/build.sbt +++ b/src/sbt-test/debian/jdeb-script-replacements/build.sbt @@ -11,9 +11,9 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" TaskKey[Unit]("checkControlFiles") := { val header = "#!/bin/sh" diff --git a/src/sbt-test/debian/simple-deb/build.sbt b/src/sbt-test/debian/simple-deb/build.sbt index bf2ed72f4..e9bd5cf05 100644 --- a/src/sbt-test/debian/simple-deb/build.sbt +++ b/src/sbt-test/debian/simple-deb/build.sbt @@ -11,10 +11,10 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageConflicts) += "debian-other-test-package" +Debian / debianPackageConflicts += "debian-other-test-package" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageProvides) += "debian-test-package" +Debian / debianPackageProvides += "debian-test-package" -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" diff --git a/src/sbt-test/debian/simple-jdeb/build.sbt b/src/sbt-test/debian/simple-jdeb/build.sbt index 04101cb69..a96f25ee0 100644 --- a/src/sbt-test/debian/simple-jdeb/build.sbt +++ b/src/sbt-test/debian/simple-jdeb/build.sbt @@ -11,10 +11,10 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageConflicts) += "debian-other-test-package" +Debian / debianPackageConflicts += "debian-other-test-package" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageProvides) += "debian-test-package" +Debian / debianPackageProvides += "debian-test-package" -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" diff --git a/src/sbt-test/debian/systemd-deb/build.sbt b/src/sbt-test/debian/systemd-deb/build.sbt index 75cc4eb08..38f18f58a 100644 --- a/src/sbt-test/debian/systemd-deb/build.sbt +++ b/src/sbt-test/debian/systemd-deb/build.sbt @@ -12,7 +12,7 @@ packageDescription := """A fun package description of our software, (Linux / daemonUser) := "testuser" -(Debian / systemdSuccessExitStatus) += "1" +Debian / systemdSuccessExitStatus += "1" TaskKey[Unit]("checkStartupScript") := { val script = IO.read(target.value / "debian-test-0.1.0" / "lib" / "systemd" / "system" / "debian-test.service") diff --git a/src/sbt-test/debian/test-executableScriptName/build.sbt b/src/sbt-test/debian/test-executableScriptName/build.sbt index 7d65fb342..2e20988dd 100644 --- a/src/sbt-test/debian/test-executableScriptName/build.sbt +++ b/src/sbt-test/debian/test-executableScriptName/build.sbt @@ -13,9 +13,9 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" TaskKey[Unit]("checkUpstartScript") := { val script = IO.read(target.value / "debian-test-0.1.0" / "etc" / "init" / "debian-test.conf") diff --git a/src/sbt-test/debian/test-mapping-helpers/build.sbt b/src/sbt-test/debian/test-mapping-helpers/build.sbt index ff31165b2..87d646131 100644 --- a/src/sbt-test/debian/test-mapping-helpers/build.sbt +++ b/src/sbt-test/debian/test-mapping-helpers/build.sbt @@ -15,13 +15,13 @@ packageDescription := """A fun package description of our software, // linuxPackageMappings in Debian += packageTemplateMapping("/var/run/debian") // not work // linuxPackageMappings in Debian += packageTemplateMapping("/var/run/debian")() // not work -(Debian / linuxPackageMappings) += packageTemplateMapping(Seq("/opt/test/other"): _*)() +Debian / linuxPackageMappings += packageTemplateMapping(Seq("/opt/test/other"): _*)() -(Debian / linuxPackageMappings) += { +Debian / linuxPackageMappings += { packageTemplateMapping("/opt/test/" + Keys.normalizedName.value)(target.value) } // Consider using mappings in Universal -(Debian / linuxPackageMappings) += packageDirectoryAndContentsMapping( +Debian / linuxPackageMappings += packageDirectoryAndContentsMapping( (baseDirectory.value / "src" / "resources" / "conf") -> "/usr/share/conf" ) diff --git a/src/sbt-test/debian/test-mapping/build.sbt b/src/sbt-test/debian/test-mapping/build.sbt index 85ebddf65..423db5193 100644 --- a/src/sbt-test/debian/test-mapping/build.sbt +++ b/src/sbt-test/debian/test-mapping/build.sbt @@ -15,9 +15,9 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" TaskKey[Unit]("checkControlScript") := { val script = diff --git a/src/sbt-test/debian/test-packageName/build.sbt b/src/sbt-test/debian/test-packageName/build.sbt index 8e6afd8de..9c1eeb836 100644 --- a/src/sbt-test/debian/test-packageName/build.sbt +++ b/src/sbt-test/debian/test-packageName/build.sbt @@ -15,9 +15,9 @@ packageSummary := "Test debian package" packageDescription := """A fun package description of our software, with multiple lines.""" -(Debian / debianPackageDependencies) ++= Seq("java2-runtime", "bash (>= 2.05a-11)") +Debian / debianPackageDependencies ++= Seq("java2-runtime", "bash (>= 2.05a-11)") -(Debian / debianPackageRecommends) += "git" +Debian / debianPackageRecommends += "git" TaskKey[Unit]("checkControlScript") := { val script = diff --git a/src/sbt-test/docker/build-command/build.sbt b/src/sbt-test/docker/build-command/build.sbt index 0f7ad6661..a12111e74 100644 --- a/src/sbt-test/docker/build-command/build.sbt +++ b/src/sbt-test/docker/build-command/build.sbt @@ -5,5 +5,5 @@ name := "docker-build-command-test" version := "0.1.0" import NativePackagerHelper._ -(Docker / mappings) ++= directory("src/main/resources/docker-test") +Docker / mappings ++= directory("src/main/resources/docker-test") dockerBuildCommand := Seq("docker", "build", "-t", "docker-build-command-test:0.1.0", "docker-test/") diff --git a/src/sbt-test/docker/test-layer-groups/build.sbt b/src/sbt-test/docker/test-layer-groups/build.sbt index 681323062..52dac99fe 100644 --- a/src/sbt-test/docker/test-layer-groups/build.sbt +++ b/src/sbt-test/docker/test-layer-groups/build.sbt @@ -4,7 +4,7 @@ organization := "com.example" name := "docker-groups" version := "0.1.0" -(Docker / dockerPackageMappings) ++= Seq( +Docker / dockerPackageMappings ++= Seq( (baseDirectory.value / "docker" / "spark-env.sh") -> "/opt/docker/spark/spark-env.sh", (baseDirectory.value / "docker" / "log4j.properties") -> "/opt/docker/other/log4j.properties" ) diff --git a/src/sbt-test/jdkpackager/test-package-mappings/build.sbt b/src/sbt-test/jdkpackager/test-package-mappings/build.sbt index 17dc05522..795d9347f 100644 --- a/src/sbt-test/jdkpackager/test-package-mappings/build.sbt +++ b/src/sbt-test/jdkpackager/test-package-mappings/build.sbt @@ -16,9 +16,9 @@ packageDescription := "Test JDKPackagerPlugin with mappings" jdkPackagerType := "image" -(Universal / mappings) += baseDirectory.value / "src" / "deploy" / "README.md" -> "README.md" +Universal / mappings += baseDirectory.value / "src" / "deploy" / "README.md" -> "README.md" -(Universal / mappings) ++= { +Universal / mappings ++= { val dir = baseDirectory.value / "src" / "deploy" / "stuff" (dir.**(AllPassFilter) --- dir) pair (file => IO.relativize(dir.getParentFile, file)) } diff --git a/src/sbt-test/jlink/test-jlink-misc/build.sbt b/src/sbt-test/jlink/test-jlink-misc/build.sbt index a115d5be6..d21c9d3ce 100644 --- a/src/sbt-test/jlink/test-jlink-misc/build.sbt +++ b/src/sbt-test/jlink/test-jlink-misc/build.sbt @@ -28,7 +28,7 @@ val issue1243 = project val issue1247BadAutoModuleName = project .enablePlugins(JlinkPlugin) .settings( - (Compile / managedClasspath) += { + Compile / managedClasspath += { // Build an empty jar with an unsupported name val jarFile = target.value / "foo_2.11.jar" IO.jar(Nil, jarFile, new java.util.jar.Manifest) @@ -72,7 +72,7 @@ val issue1266 = project libraryDependencies += "com.sun.xml.fastinfoset" % "FastInfoset" % "1.2.16", // A lot of "dummy" dependencies, so that the resulting classpath is over // the command line limit (2MB on my machine) - (Compile / unmanagedJars) ++= { + Compile / unmanagedJars ++= { def mkPath(ix: Int) = target.value / s"there-is-no-such-file-$ix.jar" 1.to(300000).map(mkPath) diff --git a/src/sbt-test/universal/absolute-path/build.sbt b/src/sbt-test/universal/absolute-path/build.sbt index d0a7fc0a6..988fe7f4c 100644 --- a/src/sbt-test/universal/absolute-path/build.sbt +++ b/src/sbt-test/universal/absolute-path/build.sbt @@ -4,9 +4,9 @@ name := "absolute-path" version := "0.1.0" -(bashScriptDefines / scriptClasspath) ++= Seq("/dummy/absolute/path", "relative/path") +bashScriptDefines / scriptClasspath ++= Seq("/dummy/absolute/path", "relative/path") -(batScriptReplacements / scriptClasspath) ++= Seq("x:\\dummy\\absolute\\path", "relative\\path") +batScriptReplacements / scriptClasspath ++= Seq("x:\\dummy\\absolute\\path", "relative\\path") TaskKey[Unit]("check") := { val dir = (Universal / stagingDirectory).value diff --git a/src/sbt-test/universal/application-ini-from-javaoptions/build.sbt b/src/sbt-test/universal/application-ini-from-javaoptions/build.sbt index bfea2935b..00964eab6 100644 --- a/src/sbt-test/universal/application-ini-from-javaoptions/build.sbt +++ b/src/sbt-test/universal/application-ini-from-javaoptions/build.sbt @@ -4,7 +4,7 @@ name := "simple-test" version := "0.1.0" -(Universal / javaOptions) ++= Seq("-J-Xmx64m", "-J-Xms64m", "-Dproperty=true") +Universal / javaOptions ++= Seq("-J-Xmx64m", "-J-Xms64m", "-Dproperty=true") TaskKey[Unit]("check") := { val application = (Universal / target).value / "tmp" / "conf" / "application.ini" diff --git a/src/sbt-test/universal/test-mapping-helpers/build.sbt b/src/sbt-test/universal/test-mapping-helpers/build.sbt index 7523d8093..b21cf0613 100644 --- a/src/sbt-test/universal/test-mapping-helpers/build.sbt +++ b/src/sbt-test/universal/test-mapping-helpers/build.sbt @@ -9,12 +9,12 @@ name := "simple-test" version := "0.1.0" // or just place your cache folder in /src/universal/ -(Universal / mappings) ++= directory("src/main/resources/cache") +Universal / mappings ++= directory("src/main/resources/cache") // or just place your cache folder in /src/universal/ -(Universal / mappings) ++= contentOf("src/main/resources/docs") +Universal / mappings ++= contentOf("src/main/resources/docs") -(Universal / mappings) += { +Universal / mappings += { (Compile / packageBin).value // we are using the reference.conf as default application.conf // the user can override settings here diff --git a/src/sbt-test/windows/absolute-path-in-bat/build.sbt b/src/sbt-test/windows/absolute-path-in-bat/build.sbt index 97487aaf8..b70ed2804 100644 --- a/src/sbt-test/windows/absolute-path-in-bat/build.sbt +++ b/src/sbt-test/windows/absolute-path-in-bat/build.sbt @@ -4,7 +4,7 @@ name := "absolute-path-in-bat" version := "0.1.0" -(batScriptReplacements / scriptClasspath) ++= Seq("x:\\dummy\\absolute\\path", "relative\\path") +batScriptReplacements / scriptClasspath ++= Seq("x:\\dummy\\absolute\\path", "relative\\path") TaskKey[Unit]("runCheck") := { val dir = (Universal / stagingDirectory).value diff --git a/src/sbt-test/windows/memory-settings/build.sbt b/src/sbt-test/windows/memory-settings/build.sbt index 2269dfc07..2dc61280a 100644 --- a/src/sbt-test/windows/memory-settings/build.sbt +++ b/src/sbt-test/windows/memory-settings/build.sbt @@ -6,7 +6,7 @@ name := "simple-app" version := "0.1.0" -(Universal / javaOptions) ++= Seq("-J-Xmx64m", "-J-Xms64m") +Universal / javaOptions ++= Seq("-J-Xmx64m", "-J-Xms64m") TaskKey[Unit]("jvmoptsCheck") := { val jvmopts = (Universal / stagingDirectory).value / "conf" / "application.ini" diff --git a/src/sphinx/formats/universal.rst b/src/sphinx/formats/universal.rst index 470a19174..5c47f474e 100644 --- a/src/sphinx/formats/universal.rst +++ b/src/sphinx/formats/universal.rst @@ -399,7 +399,7 @@ You can also use the following approach if, for example, you need more flexibili .. code-block:: scala - (Universal / mappings) ++= { + Universal / mappings ++= { val dir = target.value / "scala-2.10" / "api" (dir ** AllPassFilter) pair relativeTo(dir.getParentFile) }