luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4235 from eed3si9n/wip/bump 

Util 1.2.0-M2, LM 1.2.0-M2
This commit is contained in:
eugene yokota 2018-06-27 22:08:43 -04:00 committed by GitHub
parent 773d35dadd 17e0042bd8
commit 2c550b73f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main-settings/src/main/scala/sbt/Scope.scala
View File

@ -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)

4
project/Dependencies.scala
View File

@ -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