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

bump to Util 1.0.0-M28 and Zinc 1.0.0-X20

This commit is contained in:
Eugene Yokota 2017-07-16 22:16:33 -04:00
parent fda31ec5e7
commit c9fae43595
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/scala/sbt/Defaults.scala
View File

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

3
main/src/main/scala/sbt/internal/ConsoleProject.scala
View File

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

3
main/src/main/scala/sbt/internal/Load.scala
View File

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

4
project/Dependencies.scala
View File

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