diff --git a/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt b/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt index 53601ea4a..39bd4c2bd 100644 --- a/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt +++ b/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt @@ -1,5 +1,5 @@ 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")) .aggregate(sub2) diff --git a/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt b/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt index 9cd20a168..b93d6ca15 100644 --- a/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt +++ b/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt @@ -9,7 +9,7 @@ lazy val PerformanceTest = (config("pt") extend Test) lazy val root = (project in file(".")) .configs(PerformanceTest) - .settings(Seq(Compile, Test, Runtime, PerformanceTest).map(makeFoo) :_*) + .settings(Seq(Compile, Test, Runtime, PerformanceTest).map(makeFoo)*) .settings( PerformanceTest / bar := IO.write(file("pt-bar"), "bar") ) diff --git a/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt b/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt index 9179a8e41..f916be875 100644 --- a/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt @@ -14,7 +14,7 @@ def commonSettings: Seq[Def.Setting[?]] = ) lazy val a = project. - settings(commonSettings: _*). + settings(commonSettings). settings( name := "a", libraryDependencies := Seq( @@ -24,7 +24,7 @@ lazy val a = project. ) lazy val b = project. - settings(commonSettings: _*). + settings(commonSettings). settings( name := "b", // this adds circular dependency @@ -32,14 +32,14 @@ lazy val b = project. ) lazy val c = project. - settings(commonSettings: _*). + settings(commonSettings). settings( name := "c", libraryDependencies := Seq(organization.value %% "b" % version.value) ) lazy val root = (project in file(".")). - settings(commonSettings: _*). + settings(commonSettings). settings( (ThisBuild / organization) := "org.example", (ThisBuild / version) := "1.0-SNAPSHOT" diff --git a/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt b/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt index 62ed3af48..4eb09c87d 100644 --- a/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/circular-dependency/multi.sbt @@ -13,7 +13,7 @@ def commonSettings: Seq[Def.Setting[?]] = ) lazy val a = project. - settings(commonSettings: _*). + settings(commonSettings). settings( name := "a", libraryDependencies := Seq( @@ -22,20 +22,20 @@ lazy val a = project. ) lazy val b = project. - settings(commonSettings: _*). + settings(commonSettings). settings( name := "b" ) lazy val c = project. - settings(commonSettings: _*). + settings(commonSettings). settings( name := "c", libraryDependencies := Seq(organization.value %% "b" % version.value) ) lazy val root = (project in file(".")). - settings(commonSettings: _*). + settings(commonSettings). settings( ThisBuild / organization := "org.example", ThisBuild / version := "1.0-SNAPSHOT", diff --git a/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt b/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt index ed8a554ac..8d6fca01b 100644 --- a/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/deliver-artifacts/build.sbt @@ -2,7 +2,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c ThisBuild / organization := "org.example" 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, // such as a classifier 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") ) -lazy val b = project.settings(common: _*).settings( +lazy val b = project.settings(common).settings( libraryDependencies := Seq(organization.value %% "a" % version.value) ) diff --git a/sbt-app/src/sbt-test/dependency-management/gh-1484-npe/build.sbt b/sbt-app/src/sbt-test/dependency-management/gh-1484-npe/build.sbt index dd5731609..8cb6d6c6a 100644 --- a/sbt-app/src/sbt-test/dependency-management/gh-1484-npe/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/gh-1484-npe/build.sbt @@ -11,7 +11,7 @@ def commonSettings: Seq[Def.Setting[?]] = Seq( ) lazy val projA = project. - settings(commonSettings: _*). + settings(commonSettings). settings( addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.2"), addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.3") diff --git a/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt index fea60fb80..c8387f69e 100644 --- a/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt @@ -11,7 +11,7 @@ def commonSettings: Seq[Def.Setting[?]] = ) lazy val main = project. - settings(commonSettings: _*). + settings(commonSettings). settings( uniqueName, libraryDependencies += (projectID in library).value, @@ -21,7 +21,7 @@ lazy val main = project. ) lazy val library = project. - settings(commonSettings: _*). + settings(commonSettings). settings( uniqueName ) diff --git a/sbt-app/src/sbt-test/project-matrix/finder/build.sbt b/sbt-app/src/sbt-test/project-matrix/finder/build.sbt index a4e8632c2..cb05b2b5f 100644 --- a/sbt-app/src/sbt-test/project-matrix/finder/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/finder/build.sbt @@ -7,7 +7,7 @@ lazy val config12 = ConfigAxis("Config1_2", "config1.2") lazy val config13 = ConfigAxis("Config1_3", "config1.3") lazy val root = (project in file(".")) - .aggregate((core.projectRefs ++ custom.projectRefs):_*) + .aggregate((core.projectRefs ++ custom.projectRefs)*) lazy val core = (projectMatrix in file("core")) .jvmPlatform(scalaVersions = Seq(scala213, scala212)) diff --git a/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt index 7638c6114..2b7572232 100644 --- a/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt @@ -3,7 +3,7 @@ lazy val scala212 = "2.12.21" lazy val check = taskKey[Unit]("") lazy val root = (project in file(".")) - .aggregate(core.projectRefs ++ app.projectRefs: _*) + .aggregate((core.projectRefs ++ app.projectRefs)*) .settings( ) diff --git a/sbt-app/src/sbt-test/project-matrix/jvm/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm/build.sbt index 4e1746b0c..1c422e7a3 100644 --- a/sbt-app/src/sbt-test/project-matrix/jvm/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/jvm/build.sbt @@ -3,7 +3,7 @@ lazy val scala3 = "3.4.2" lazy val check = taskKey[Unit]("") lazy val root = (project in file(".")) - .aggregate(core.projectRefs ++ app.projectRefs: _*) + .aggregate((core.projectRefs ++ app.projectRefs)*) .settings( ) diff --git a/sbt-app/src/sbt-test/project-matrix/projectAxes/build.sbt b/sbt-app/src/sbt-test/project-matrix/projectAxes/build.sbt index 956fc9c2f..298b760bb 100644 --- a/sbt-app/src/sbt-test/project-matrix/projectAxes/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/projectAxes/build.sbt @@ -9,7 +9,7 @@ lazy val config12 = ConfigAxis("Config1_2", "config1.2") lazy val config13 = ConfigAxis("Config1_3", "config1.3") lazy val root = (project in file(".")) - .aggregate((core.projectRefs ++ custom.projectRefs):_*) + .aggregate((core.projectRefs ++ custom.projectRefs)*) lazy val core = (projectMatrix in file("core")) .settings( diff --git a/sbt-app/src/sbt-test/project/circular/build.sbt b/sbt-app/src/sbt-test/project/circular/build.sbt index da3f9877c..698ea5872 100644 --- a/sbt-app/src/sbt-test/project/circular/build.sbt +++ b/sbt-app/src/sbt-test/project/circular/build.sbt @@ -15,4 +15,4 @@ lazy val foo: Project = project. dependsOn(LocalProject("root")). settings(List( name := (LocalProject("root") / name).value + "foo" - ): _*) + )*) diff --git a/sbt-app/src/sbt-test/tests/bak/build.sbt b/sbt-app/src/sbt-test/tests/bak/build.sbt index b92d11dea..4d7d7d37c 100644 --- a/sbt-app/src/sbt-test/tests/bak/build.sbt +++ b/sbt-app/src/sbt-test/tests/bak/build.sbt @@ -23,7 +23,7 @@ val CustomConfigs = List(Config_0, Config_1, Config_2, Config_3, Config_4, Confi val t = taskKey[Unit]("") val p1 = project - .configs(CustomConfigs: _*) + .configs(CustomConfigs*) .settings( t := Def.uncached { (Config_0 / compile).value