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

Merge pull request #4031 from eed3si9n/wip/bump 

bump modules
This commit is contained in:
eugene yokota 2018-03-26 10:26:25 -04:00 committed by GitHub
parent 131c2a7a68 9d2d81645b
commit cd40d1ac77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -623,12 +623,15 @@ object Defaults extends BuildCommon {
if (ScalaInstance.isDotty(scalaVersion.value)) if (ScalaInstance.isDotty(scalaVersion.value))
file(ScalaArtifacts.dottyID(binVersion)) file(ScalaArtifacts.dottyID(binVersion))
else file(ScalaArtifacts.CompilerID) else file(ScalaArtifacts.CompilerID)
new ScalaInstance(scalaVersion.value, new ScalaInstance(
scalaVersion.value,
makeClassLoader(state.value)(allJars.toList), makeClassLoader(state.value)(allJars.toList),
makeClassLoader(state.value)(List(libraryJar)),
libraryJar, libraryJar,
compilerJar, compilerJar,
allJars.toArray, allJars.toArray,
None) None
)
} }
def scalaInstanceFromHome(dir: File): Initialize[Task[ScalaInstance]] = Def.task { def scalaInstanceFromHome(dir: File): Initialize[Task[ScalaInstance]] = Def.task {
ScalaInstance(dir)(makeClassLoader(state.value)) ScalaInstance(dir)(makeClassLoader(state.value))

10
project/Dependencies.scala
View File

@ -9,9 +9,9 @@ object Dependencies {
// sbt modules // sbt modules
private val ioVersion = "1.1.4" private val ioVersion = "1.1.4"
private val utilVersion = "1.1.2" private val utilVersion = "1.1.3"
private val lmVersion = "1.1.3" private val lmVersion = "1.1.4"
private val zincVersion = "1.1.1" private val zincVersion = "1.1.3"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
@ -26,8 +26,8 @@ object Dependencies {
private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion
private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.2" val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.3"
val rawLauncher = "org.scala-sbt" % "launcher" % "1.0.2" val rawLauncher = "org.scala-sbt" % "launcher" % "1.0.3"
val testInterface = "org.scala-sbt" % "test-interface" % "1.0" val testInterface = "org.scala-sbt" % "test-interface" % "1.0"
val ipcSocket = "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.0.0" val ipcSocket = "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.0.0"