Revert "Switch to varargs inThisBuild (+friends)"

This reverts commit ccf938c786.

main/src/main/scala/sbt/Defaults.scala

@@ -135,8 +135,10 @@ object Defaults extends BuildCommon {
   def buildCore: Seq[Setting[_]] = thisBuildCore ++ globalCore
   def thisBuildCore: Seq[Setting[_]] =
     inScope(GlobalScope.copy(project = Select(ThisBuild)))(
+      Seq(
         managedDirectory := baseDirectory.value / "lib_managed"
       )
+    )
   private[sbt] lazy val globalCore: Seq[Setting[_]] = globalDefaults(
     defaultTestTasks(test) ++ defaultTestTasks(testOnly) ++ defaultTestTasks(testQuick) ++ Seq(
       excludeFilter :== HiddenFileFilter
@@ -303,9 +305,11 @@ object Defaults extends BuildCommon {
 
   def defaultTestTasks(key: Scoped): Seq[Setting[_]] =
     inTask(key)(
+      Seq(
         tags := Seq(Tags.Test -> 1),
         logBuffered := true
       )
+    )
 
   // TODO: This should be on the new default settings for a project.
   def projectCore: Seq[Setting[_]] = Seq(
@@ -761,6 +765,7 @@ object Defaults extends BuildCommon {
   lazy val ConfigGlobal: Scope = ConfigZero
   def testTaskOptions(key: Scoped): Seq[Setting[_]] =
     inTask(key)(
+      Seq(
         testListeners := {
           TestLogger.make(
             streams.value.log,
@@ -775,9 +780,12 @@ object Defaults extends BuildCommon {
         },
         testOptions := Tests.Listeners(testListeners.value) +: (testOptions in TaskZero).value,
         testExecution := testExecutionTask(key).value
+      )
     ) ++ inScope(GlobalScope)(
+      Seq(
         derive(testGrouping := singleTestGroupDefault.value)
       )
+    )
 
   private[this] def closeableTestLogger(manager: Streams, baseKey: Scoped, buffered: Boolean)(
       tdef: TestDefinition
@@ -1049,6 +1057,7 @@ object Defaults extends BuildCommon {
 
   lazy val packageConfig: Seq[Setting[_]] =
     inTask(packageBin)(
+      Seq(
         packageOptions := {
           val n = name.value
           val ver = version.value
@@ -1060,13 +1069,16 @@ object Defaults extends BuildCommon {
             Package.addImplManifestAttributes(n, ver, homepage.value, org, orgName) +:
             main.map(Package.MainClass.apply) ++: old
         }
+      )
     ) ++
       inTask(packageSrc)(
+        Seq(
           packageOptions := Package.addSpecManifestAttributes(
             name.value,
             version.value,
             organizationName.value
           ) +: packageOptions.value
+        )
       ) ++
       packageTaskSettings(packageBin, packageBinMappings) ++
       packageTaskSettings(packageSrc, packageSrcMappings) ++
@@ -1154,6 +1166,7 @@ object Defaults extends BuildCommon {
 
   def packageTaskSettings(key: TaskKey[File], mappingsTask: Initialize[Task[Seq[(File, String)]]]) =
     inTask(key)(
+      Seq(
         key in TaskZero := packageTask.value,
         packageConfiguration := packageConfigurationTask.value,
         mappings := mappingsTask.value,
@@ -1161,6 +1174,7 @@ object Defaults extends BuildCommon {
         artifact := artifactSetting.value,
         artifactPath := artifactPathSetting(artifact).value
       )
+    )
 
   def packageTask: Initialize[Task[File]] =
     Def.task {
@@ -1367,6 +1381,7 @@ object Defaults extends BuildCommon {
 
   def docTaskSettings(key: TaskKey[File] = doc): Seq[Setting[_]] =
     inTask(key)(
+      Seq(
         apiMappings ++= {
           val dependencyCp = dependencyClasspath.value
           val log = streams.value.log
@@ -1411,6 +1426,7 @@ object Defaults extends BuildCommon {
           out
         }
       )
+    )
 
   def mainBgRunTask = mainBgRunTaskForConfig(Select(Runtime))
   def mainBgRunMainTask = mainBgRunMainTaskForConfig(Select(Runtime))
@@ -1710,6 +1726,7 @@ object Defaults extends BuildCommon {
   // build.sbt is treated a Scala source of metabuild, so to enable deprecation flag on build.sbt we set the option here.
   lazy val deprecationSettings: Seq[Setting[_]] =
     inConfig(Compile)(
+      Seq(
         scalacOptions := {
           val old = scalacOptions.value
           val existing = old.toSet
@@ -1718,6 +1735,7 @@ object Defaults extends BuildCommon {
           else old
         }
       )
+    )
 }
 object Classpaths {
   import Keys._
@@ -2258,6 +2276,7 @@ object Classpaths {
   def sbtClassifiersTasks =
     sbtClassifiersGlobalDefaults ++
       inTask(updateSbtClassifiers)(
+        Seq(
           externalResolvers := {
             val explicit = buildStructure.value
               .units(thisProjectRef.value.build)
@@ -2334,6 +2353,7 @@ object Classpaths {
                 }
             }
           } tag (Tags.Update, Tags.Network)).value
+        )
       ) ++ Seq(bootIvyConfiguration := (ivyConfiguration in updateSbtClassifiers).value)
 
   def classifiersModuleTask: Initialize[Task[GetClassifiersModule]] =
@@ -3457,7 +3477,7 @@ trait BuildExtra extends BuildCommon with DefExtra {
    * This is useful for reducing test:compile time when not running test.
    */
   def noTestCompletion(config: Configuration = Test): Setting[_] =
-    inConfig(config)(definedTests := detectTests.value).head
+    inConfig(config)(Seq(definedTests := detectTests.value)).head
 
   def filterKeys(ss: Seq[Setting[_]], transitive: Boolean = false)(
       f: ScopedKey[_] => Boolean

main/src/main/scala/sbt/PluginCross.scala

@@ -47,7 +47,7 @@ private[sbt] object PluginCross {
         val add = List(sbtVersion in GlobalScope in pluginCrossBuild :== version) ++
           List(scalaVersion := scalaVersionSetting.value) ++
           inScope(GlobalScope.copy(project = Select(currentRef)))(
-            scalaVersion := scalaVersionSetting.value
+            Seq(scalaVersion := scalaVersionSetting.value)
           )
         val cleared = session.mergeSettings.filterNot(crossExclude)
         val newStructure = Load.reapply(cleared ++ add, structure, state.log)

main/src/main/scala/sbt/internal/GlobalPlugin.scala

@@ -106,12 +106,14 @@ object GlobalPlugin {
     }
   }
   val globalPluginSettings = Project.inScope(Scope.GlobalScope in LocalRootProject)(
+    Seq(
       organization := SbtArtifacts.Organization,
       onLoadMessage := Keys.baseDirectory("Loading global plugins from " + _).value,
       name := "global-plugin",
       sbtPlugin := true,
       version := "0.0"
     )
+  )
 }
 final case class GlobalPluginData(
     projectID: ModuleID,

main/src/main/scala/sbt/internal/Load.scala

@@ -1189,6 +1189,7 @@ private[sbt] object Load {
 
   /** These are the settings defined when loading a project "meta" build. */
   val autoPluginSettings: Seq[Setting[_]] = inScope(GlobalScope in LocalRootProject)(
+    Seq(
       sbtPlugin :== true,
       pluginData := {
         val prod = (exportedProducts in Configurations.Runtime).value
@@ -1204,6 +1205,7 @@ private[sbt] object Load {
       },
       onLoadMessage := ("Loading project definition from " + baseDirectory.value)
     )
+  )
 
   private[this] def removeEntries(
       cp: Seq[Attributed[File]],

sbt/src/sbt-test/actions/cross-multiproject/build.sbt

@@ -1,6 +1,6 @@
-inThisBuild(
+inThisBuild(List(
   crossScalaVersions := Seq("2.12.1", "2.11.8")
-)
+))
 
 lazy val rootProj = (project in file("."))
   .aggregate(libProj, fooPlugin)

sbt/src/sbt-test/actions/previous/scopes.sbt

@@ -22,7 +22,7 @@ x in subA in Compile := {
 }
 
 
-inConfig(Compile)(
+inConfig(Compile)(Seq(
 	y in subB := {
 		// verify that the referenced key gets delegated
 		val xty = (x in Test in y).previous getOrElse 0  // 13
@@ -31,7 +31,7 @@ inConfig(Compile)(
 		println(s"xcy=$xcy, xty=$xty")
 		xty * xcy
 	}
-)
+))
 
 def parser = {
 	import complete.DefaultParsers._

sbt/src/sbt-test/dependency-management/cache-update/build.sbt

@@ -4,7 +4,7 @@ dependencyOverrides in ThisBuild += "com.github.nscala-time" %% "nscala-time" %
 lazy val root = (project in file("."))
   .dependsOn(p1 % Compile)
   .settings(
-    inThisBuild(
+    inThisBuild(List(
       organizationName := "eed3si9n",
       organizationHomepage := Some(url("http://example.com/")),
       homepage := Some(url("https://github.com/example/example")),
@@ -20,7 +20,7 @@ lazy val root = (project in file("."))
       version := "0.3.1-SNAPSHOT",
       description := "An HTTP client for Scala with Async Http Client underneath.",
       licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")),
-    ),
+    )),
     ivyPaths := IvyPaths(
       (baseDirectory in ThisBuild).value,
       Some((baseDirectory in LocalRootProject).value / "ivy-cache")

sbt/src/sbt-test/dependency-management/cached-resolution-circular/multi.sbt

@@ -41,8 +41,8 @@ lazy val c = project.
 
 lazy val root = (project in file(".")).
   settings(commonSettings).
-  settings(inThisBuild(
+  settings(inThisBuild(Seq(
     organization := "org.example",
     version := "1.0-SNAPSHOT",
     updateOptions := updateOptions.value.withCachedResolution(true)
-  ))
+  )))

sbt/src/sbt-test/dependency-management/cached-resolution-conflicts/multi.sbt

@@ -1,12 +1,12 @@
 // https://github.com/sbt/sbt/issues/1710
 // https://github.com/sbt/sbt/issues/1760
 
-inThisBuild(
+inThisBuild(Seq(
   organization := "com.example",
   version := "0.1.0",
   scalaVersion := "2.10.4",
   updateOptions := updateOptions.value.withCachedResolution(true)
-)
+))
 
 def commonSettings: Seq[Def.Setting[_]] = Seq(
   ivyPaths := IvyPaths((baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")),

sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt

@@ -27,7 +27,7 @@ lazy val b = project.
 
 lazy val root = (project in file(".")).
   aggregate(a, b).
-  settings(inThisBuild(
+  settings(inThisBuild(Seq(
     organization := "org.example",
     version := "1.0",
     updateOptions := updateOptions.value.withCachedResolution(true),
@@ -45,4 +45,4 @@ lazy val root = (project in file(".")).
         sys.error("commons-io NOT found when it should NOT be excluded")
       }
     }
-  ))
+  )))

sbt/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt

@@ -27,7 +27,7 @@ lazy val a = project.
 
 lazy val root = (project in file(".")).
   aggregate(a).
-  settings(inThisBuild(
+  settings(inThisBuild(Seq(
     organization := "org.example",
     version := "1.0",
     updateOptions := updateOptions.value.withCachedResolution(true),
@@ -49,4 +49,4 @@ lazy val root = (project in file(".")).
         sys.error("junit NOT found when it should be included: " + atestcp.toString)
       }
     }
-  ))
+  )))

sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt

@@ -2,12 +2,12 @@ lazy val p1 = (project in file("p1")).
   settings(
     checkTask(expectedMongo),
     libraryDependencies += "org.mongodb" %% "casbah" % "2.4.1" pomOnly(),
-    inThisBuild(
+    inThisBuild(List(
       organization := "org.example",
       version := "1.0",
       scalaVersion := "2.9.2",
       autoScalaLibrary := false
-    )
+    ))
   )
 
 lazy val p2 = (project in file("p2")).

sbt/src/sbt-test/dependency-management/publish-local/build.sbt

@@ -1,12 +1,12 @@
 lazy val root = (project in file(".")).
   dependsOn(sub).
   aggregate(sub).
-  settings(inThisBuild(
+  settings(inThisBuild(List(
       organization := "A",
       version := "1.0",
       ivyPaths := baseDirectory( dir => IvyPaths(dir, Some(dir / "ivy" / "cache")) ).value,
       externalResolvers := (baseDirectory map { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil }).value
-    ),
+    )),
     mavenStyle,
     interProject,
     name := "Publish Test"

sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.sbt

@@ -1,10 +1,10 @@
 lazy val root = (project in file(".")).
-  settings(inThisBuild(
+  settings(inThisBuild(List(
       organization := "A",
       version := "1.0",
       ivyPaths := baseDirectory( dir => IvyPaths(dir, Some(dir / "ivy" / "cache")) ).value,
       externalResolvers := (baseDirectory map { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil }).value
-    ),
+    )),
     mavenStyle,
     name := "Retrieve Test",
     libraryDependencies := (publishMavenStyle { style => if(style) mavenStyleDependencies else ivyStyleDependencies }).value

sbt/src/sbt-test/project/derived/build.sbt

@@ -23,7 +23,7 @@ globalDepE in Global := "globalE"
 // ---------------- Derived settings
 
 // verify that deriving is transitive
-inScope(GlobalScope)(
+inScope(GlobalScope)(Seq(
   Def.derive(customA := customB.value + "-a"),
   Def.derive(customB := thisProject.value.id + "-b"),
   // verify that a setting with multiple triggers still only gets added once
@@ -36,7 +36,7 @@ inScope(GlobalScope)(
   //  if customE were added in Global because of name, there would be an error
   //  because description wouldn't be found
   Def.derive(customE := globalDepE.value + "-" + projectDepE.value)
-)
+))
 
 // ---------------- Projects
 

sbt/src/sbt-test/tests/fork-test-group-parallel/build.sbt

@@ -1,7 +1,7 @@
 scalaVersion in ThisBuild := "2.11.8"
 concurrentRestrictions in Global := Seq(Tags.limitAll(4))
 libraryDependencies += "org.specs2" %% "specs2-core" % "3.8.4" % Test
-inConfig(Test)(
+inConfig(Test)(Seq(
   testGrouping := {
     val home = javaHome.value
     val strategy = outputStrategy.value
@@ -22,4 +22,4 @@ inConfig(Test)(
     ))}
   },
   TaskKey[Unit]("test-failure") := test.failure.value
-)
+))