diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 7b8d535e6..4972c2aee 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -471,8 +471,7 @@ object Defaults extends BuildCommon { globalLock = launcher.globalLock, componentProvider = app.provider.components, secondaryCacheDir = Option(zincDir), - // Todo: Fix typo - depencencyResolution = dependencyResolution.value, + dependencyResolution = dependencyResolution.value, compilerBridgeSource = scalaCompilerBridgeSource.value, scalaJarsTarget = zincDir, log = streams.value.log diff --git a/main/src/main/scala/sbt/internal/ConsoleProject.scala b/main/src/main/scala/sbt/internal/ConsoleProject.scala index b74846a85..4823c095e 100644 --- a/main/src/main/scala/sbt/internal/ConsoleProject.scala +++ b/main/src/main/scala/sbt/internal/ConsoleProject.scala @@ -30,8 +30,7 @@ object ConsoleProject { globalLock = launcher.globalLock, componentProvider = app.provider.components, secondaryCacheDir = Option(zincDir), - // Todo: Fix typo - depencencyResolution = dependencyResolution, + dependencyResolution = dependencyResolution, compilerBridgeSource = extracted.get(Keys.scalaCompilerBridgeSource), scalaJarsTarget = zincDir, log = log diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index 114196fb9..3bbb133ca 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -94,8 +94,7 @@ private[sbt] object Load { globalLock = launcher.globalLock, componentProvider = app.provider.components, secondaryCacheDir = Option(zincDir), - // Todo: Fix typo - depencencyResolution = dependencyResolution, + dependencyResolution = dependencyResolution, compilerBridgeSource = ZincUtil.getDefaultBridgeModule(scalaProvider.version), scalaJarsTarget = zincDir, log = log diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c23ec1d38..9c20d1657 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,9 +13,9 @@ object Dependencies { // sbt modules private val ioVersion = "1.0.0-M12" - private val utilVersion = "1.0.0-M27" + private val utilVersion = "1.0.0-M28" private val lmVersion = "1.0.0-X18" - private val zincVersion = "1.0.0-X19" + private val zincVersion = "1.0.0-X20" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion