From 14a31634e753ded5a92d2f56e2f5ea49e6fc5c55 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 27 Jun 2018 21:06:40 -0400 Subject: [PATCH 1/2] Code formatting --- main-settings/src/main/scala/sbt/Scope.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main-settings/src/main/scala/sbt/Scope.scala b/main-settings/src/main/scala/sbt/Scope.scala index 9f8eecdf5..2d761f0b3 100644 --- a/main-settings/src/main/scala/sbt/Scope.scala +++ b/main-settings/src/main/scala/sbt/Scope.scala @@ -296,8 +296,9 @@ object Scope { val scope = Scope.replaceThis(GlobalScope)(rawScope) // This is a hot method that gets called many times - def expandDelegateScopes(resolvedProj: ResolvedReference)( - pLin: Seq[ScopeAxis[ResolvedReference]]): Vector[Scope] = { + def expandDelegateScopes( + resolvedProj: ResolvedReference + )(pLin: Seq[ScopeAxis[ResolvedReference]]): Vector[Scope] = { val tLin = scope.task match { case t @ Select(_) => linearize(t)(taskInherit) case _ => withZeroAxis(scope.task) From 17e0042bd8fe161450d5091ac9ceddfd82d51b83 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 27 Jun 2018 21:07:03 -0400 Subject: [PATCH 2/2] Util 1.2.0-M2, LM 1.2.0-M2 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a7e6e69b1..4da547a9d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,8 +9,8 @@ object Dependencies { // sbt modules private val ioVersion = "1.2.0-M2" - private val utilVersion = "1.2.0-M1" - private val lmVersion = "1.2.0-M1" + private val utilVersion = "1.2.0-M2" + private val lmVersion = "1.2.0-M2" private val zincVersion = "1.2.0-M1" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion