From 26c180e768760b0bac226581fd224120553c5418 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 5 Aug 2018 16:00:33 -0400 Subject: [PATCH] Revert "Switch inThisBuild (+friends) to use varargs SettingsDefinition" This reverts commit f459b218c47a330354111c884e4f204cd9067d02. --- main/src/main/scala/sbt/Project.scala | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/main/src/main/scala/sbt/Project.scala b/main/src/main/scala/sbt/Project.scala index fcf5654dc..a6324868c 100755 --- a/main/src/main/scala/sbt/Project.scala +++ b/main/src/main/scala/sbt/Project.scala @@ -32,7 +32,7 @@ import Keys.{ watch } import Scope.{ Global, ThisScope } -import Def.{ Flattened, Initialize, ScopedKey, Setting, SettingsDefinition } +import Def.{ Flattened, Initialize, ScopedKey, Setting } import sbt.internal.{ Load, BuildStructure, @@ -892,19 +892,17 @@ trait ProjectExtra { implicit def richTaskSessionVar[T](init: Initialize[Task[T]]): Project.RichTaskSessionVar[T] = new Project.RichTaskSessionVar(init) - def inThisBuild(ss: SettingsDefinition*): Seq[Setting[_]] = - inScope(ThisScope.copy(project = Select(ThisBuild)))(ss flatMap (_.settings)) + def inThisBuild(ss: Seq[Setting[_]]): Seq[Setting[_]] = + inScope(ThisScope.copy(project = Select(ThisBuild)))(ss) - def inConfig(conf: Configuration)(ss: SettingsDefinition*): Seq[Setting[_]] = - inScope(ThisScope.copy(config = Select(conf)))( - (configuration :== conf) +: (ss flatMap (_.settings)) - ) + def inConfig(conf: Configuration)(ss: Seq[Setting[_]]): Seq[Setting[_]] = + inScope(ThisScope.copy(config = Select(conf)))((configuration :== conf) +: ss) - def inTask(t: Scoped)(ss: SettingsDefinition*): Seq[Setting[_]] = - inScope(ThisScope.copy(task = Select(t.key)))(ss flatMap (_.settings)) + def inTask(t: Scoped)(ss: Seq[Setting[_]]): Seq[Setting[_]] = + inScope(ThisScope.copy(task = Select(t.key)))(ss) - def inScope(scope: Scope)(ss: SettingsDefinition*): Seq[Setting[_]] = - Project.transform(Scope.replaceThis(scope), ss flatMap (_.settings)) + def inScope(scope: Scope)(ss: Seq[Setting[_]]): Seq[Setting[_]] = + Project.transform(Scope.replaceThis(scope), ss) private[sbt] def inThisBuild[T](i: Initialize[T]): Initialize[T] = inScope(ThisScope.copy(project = Select(ThisBuild)), i)