mirror of https://github.com/sbt/sbt.git
[2.x] test: Avoid old varargs splice syntax in test (#8806)
This commit is contained in:
parent
2688f7153c
commit
af57abe1ce
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@ lazy val foo: Project = project.
|
|||
dependsOn(LocalProject("root")).
|
||||
settings(List(
|
||||
name := (LocalProject("root") / name).value + "foo"
|
||||
): _*)
|
||||
)*)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue