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

Merge pull request #2721 from eed3si9n/wip/zinc_x2 

bumping to zinc 1.0.0-X3
This commit is contained in:
eugene yokota 2016-09-07 00:45:31 -04:00 committed by GitHub
parent 1ba7bb0fb9 f4400ed171
commit 26d0b25a12
2 changed files with 3 additions and 2 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

@ -315,7 +315,7 @@ object Defaults extends BuildCommon {
val extra =
if (crossPaths.value) s"_${scalaBinaryVersion.value}"
else ""
s"inc_compile${extra}"
s"inc_compile${extra}.zip"
},
compileIncSetup := compileIncSetupTask.value,
console := consoleTask.value,
@ -944,6 +944,7 @@ object Defaults extends BuildCommon {
compilerCache.value,
incOptions.value,
(compilerReporter in compile).value,
o2m(None),
// TODO - task / setting for extra,
Array.empty)
}

2
project/Dependencies.scala
View File

@ -12,7 +12,7 @@ object Dependencies {
val ioVersion = "1.0.0-M6"
val utilVersion = "0.1.0-M13"
val librarymanagementVersion = "0.1.0-X1"
val zincVersion = "1.0.0-X1"
val zincVersion = "1.0.0-X3"
lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion
lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion
lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion