[2.x] test: Avoid old varargs splice syntax in test (#8806)

This commit is contained in:
kenji yoshida 2026-02-24 14:18:11 +09:00 committed by GitHub
parent 2688f7153c
commit af57abe1ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 21 additions and 21 deletions

View File

@ -1,5 +1,5 @@
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.aggregate((if(file("aggregate").exists) Seq(sub: sbt.ProjectReference) else Nil): _*) .aggregate((if(file("aggregate").exists) Seq(sub: sbt.ProjectReference) else Nil)*)
lazy val sub = (project in file("sub")) lazy val sub = (project in file("sub"))
.aggregate(sub2) .aggregate(sub2)

View File

@ -9,7 +9,7 @@ lazy val PerformanceTest = (config("pt") extend Test)
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.configs(PerformanceTest) .configs(PerformanceTest)
.settings(Seq(Compile, Test, Runtime, PerformanceTest).map(makeFoo) :_*) .settings(Seq(Compile, Test, Runtime, PerformanceTest).map(makeFoo)*)
.settings( .settings(
PerformanceTest / bar := IO.write(file("pt-bar"), "bar") PerformanceTest / bar := IO.write(file("pt-bar"), "bar")
) )

View File

@ -14,7 +14,7 @@ def commonSettings: Seq[Def.Setting[?]] =
) )
lazy val a = project. lazy val a = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
name := "a", name := "a",
libraryDependencies := Seq( libraryDependencies := Seq(
@ -24,7 +24,7 @@ lazy val a = project.
) )
lazy val b = project. lazy val b = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
name := "b", name := "b",
// this adds circular dependency // this adds circular dependency
@ -32,14 +32,14 @@ lazy val b = project.
) )
lazy val c = project. lazy val c = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
name := "c", name := "c",
libraryDependencies := Seq(organization.value %% "b" % version.value) libraryDependencies := Seq(organization.value %% "b" % version.value)
) )
lazy val root = (project in file(".")). lazy val root = (project in file(".")).
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
(ThisBuild / organization) := "org.example", (ThisBuild / organization) := "org.example",
(ThisBuild / version) := "1.0-SNAPSHOT" (ThisBuild / version) := "1.0-SNAPSHOT"

View File

@ -13,7 +13,7 @@ def commonSettings: Seq[Def.Setting[?]] =
) )
lazy val a = project. lazy val a = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
name := "a", name := "a",
libraryDependencies := Seq( libraryDependencies := Seq(
@ -22,20 +22,20 @@ lazy val a = project.
) )
lazy val b = project. lazy val b = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
name := "b" name := "b"
) )
lazy val c = project. lazy val c = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
name := "c", name := "c",
libraryDependencies := Seq(organization.value %% "b" % version.value) libraryDependencies := Seq(organization.value %% "b" % version.value)
) )
lazy val root = (project in file(".")). lazy val root = (project in file(".")).
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
ThisBuild / organization := "org.example", ThisBuild / organization := "org.example",
ThisBuild / version := "1.0-SNAPSHOT", ThisBuild / version := "1.0-SNAPSHOT",

View File

@ -2,7 +2,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c
ThisBuild / organization := "org.example" ThisBuild / organization := "org.example"
ThisBuild / version := "1.0" ThisBuild / version := "1.0"
lazy val a = project.settings(common: _*).settings( lazy val a = project.settings(common).settings(
// verifies that a can be published as an ivy.xml file and preserve the extra artifact information, // verifies that a can be published as an ivy.xml file and preserve the extra artifact information,
// such as a classifier // such as a classifier
libraryDependencies := Seq(("net.sf.json-lib" % "json-lib" % "2.4").classifier("jdk15").intransitive()), libraryDependencies := Seq(("net.sf.json-lib" % "json-lib" % "2.4").classifier("jdk15").intransitive()),
@ -10,7 +10,7 @@ lazy val a = project.settings(common: _*).settings(
(Compile / packageBin / artifact) := Artifact("demo") (Compile / packageBin / artifact) := Artifact("demo")
) )
lazy val b = project.settings(common: _*).settings( lazy val b = project.settings(common).settings(
libraryDependencies := Seq(organization.value %% "a" % version.value) libraryDependencies := Seq(organization.value %% "a" % version.value)
) )

View File

@ -11,7 +11,7 @@ def commonSettings: Seq[Def.Setting[?]] = Seq(
) )
lazy val projA = project. lazy val projA = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.2"), addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.2"),
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.3") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.3")

View File

@ -11,7 +11,7 @@ def commonSettings: Seq[Def.Setting[?]] =
) )
lazy val main = project. lazy val main = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
uniqueName, uniqueName,
libraryDependencies += (projectID in library).value, libraryDependencies += (projectID in library).value,
@ -21,7 +21,7 @@ lazy val main = project.
) )
lazy val library = project. lazy val library = project.
settings(commonSettings: _*). settings(commonSettings).
settings( settings(
uniqueName uniqueName
) )

View File

@ -7,7 +7,7 @@ lazy val config12 = ConfigAxis("Config1_2", "config1.2")
lazy val config13 = ConfigAxis("Config1_3", "config1.3") lazy val config13 = ConfigAxis("Config1_3", "config1.3")
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.aggregate((core.projectRefs ++ custom.projectRefs):_*) .aggregate((core.projectRefs ++ custom.projectRefs)*)
lazy val core = (projectMatrix in file("core")) lazy val core = (projectMatrix in file("core"))
.jvmPlatform(scalaVersions = Seq(scala213, scala212)) .jvmPlatform(scalaVersions = Seq(scala213, scala212))

View File

@ -3,7 +3,7 @@ lazy val scala212 = "2.12.21"
lazy val check = taskKey[Unit]("") lazy val check = taskKey[Unit]("")
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.aggregate(core.projectRefs ++ app.projectRefs: _*) .aggregate((core.projectRefs ++ app.projectRefs)*)
.settings( .settings(
) )

View File

@ -3,7 +3,7 @@ lazy val scala3 = "3.4.2"
lazy val check = taskKey[Unit]("") lazy val check = taskKey[Unit]("")
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.aggregate(core.projectRefs ++ app.projectRefs: _*) .aggregate((core.projectRefs ++ app.projectRefs)*)
.settings( .settings(
) )

View File

@ -9,7 +9,7 @@ lazy val config12 = ConfigAxis("Config1_2", "config1.2")
lazy val config13 = ConfigAxis("Config1_3", "config1.3") lazy val config13 = ConfigAxis("Config1_3", "config1.3")
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.aggregate((core.projectRefs ++ custom.projectRefs):_*) .aggregate((core.projectRefs ++ custom.projectRefs)*)
lazy val core = (projectMatrix in file("core")) lazy val core = (projectMatrix in file("core"))
.settings( .settings(

View File

@ -15,4 +15,4 @@ lazy val foo: Project = project.
dependsOn(LocalProject("root")). dependsOn(LocalProject("root")).
settings(List( settings(List(
name := (LocalProject("root") / name).value + "foo" name := (LocalProject("root") / name).value + "foo"
): _*) )*)

View File

@ -23,7 +23,7 @@ val CustomConfigs = List(Config_0, Config_1, Config_2, Config_3, Config_4, Confi
val t = taskKey[Unit]("") val t = taskKey[Unit]("")
val p1 = project val p1 = project
.configs(CustomConfigs: _*) .configs(CustomConfigs*)
.settings( .settings(
t := Def.uncached { t := Def.uncached {
(Config_0 / compile).value (Config_0 / compile).value