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

Merge branch '1.1.x' into wip/merge-1.1.x

This commit is contained in:
Eugene Yokota 2018-05-04 21:55:50 -04:00
parent 8409735077 03f49dd481
commit 96287f1ad5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.1.2
sbt.version=1.1.4

11
sbt/src/test/scala/sbt/RunFromSourceMain.scala
View File

@ -69,18 +69,19 @@ object RunFromSourceMain {
private lazy val bootDirectory: File = file(sys.props("user.home")) / ".sbt" / "boot"
private lazy val scalaHome: File = {
val log = sbt.util.LogExchange.logger("run-from-source")
val scalaHome0 = bootDirectory / s"scala-$scalaVersion"
if (scalaHome0.exists) scalaHome0
if ((scalaHome0 / "lib").exists) scalaHome0
else {
val target = new File("target").getAbsoluteFile
val fakeboot = target / "fakeboot"
log.info(s"""scalaHome ($scalaHome0) wasn't found""")
val fakeboot = file(sys.props("user.home")) / ".sbt" / "fakeboot"
val scalaHome1 = fakeboot / s"scala-$scalaVersion"
val scalaHome1Lib = scalaHome1 / "lib"
val scalaHome1Temp = scalaHome1 / "temp"
if (scalaHome1Lib.exists) ()
if (scalaHome1Lib.exists) log.info(s"""using $scalaHome1 that was found""")
else {
log.info(s"""creating $scalaHome1 by downloading scala-compiler $scalaVersion""")
IO.createDirectories(List(scalaHome1Lib, scalaHome1Temp))
val log = sbt.util.LogExchange.logger("run-from-source")
val lm = {
import sbt.librarymanagement.ivy.IvyDependencyResolution
val ivyConfig = InlineIvyConfiguration().withLog(log)