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

Fix error in migration to sbt/io

This commit is contained in:
Martin Duhem 2015-09-02 16:33:52 +02:00
parent e2ddae8d98
commit aec1e5fd52
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
View File

@ -92,6 +92,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
private val sbtOrgTemp = JsonUtil.sbtOrgTemp private val sbtOrgTemp = JsonUtil.sbtOrgTemp
private val modulePrefixTemp = "temp-module-" private val modulePrefixTemp = "temp-module-"
private val ivySbt: IvySbt = new IvySbt(ivyConfiguration) private val ivySbt: IvySbt = new IvySbt(ivyConfiguration)
// TODO: The actual sbt version may be different from the component manager's version
private val sbtVersion = ComponentManager.version private val sbtVersion = ComponentManager.version
def apply(id: String): File = { def apply(id: String): File = {
@ -149,7 +150,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
private def getModule(id: String): ivySbt.Module = { private def getModule(id: String): ivySbt.Module = {
val sha1 = Hash.toHex(Hash(id)) val sha1 = Hash.toHex(Hash(id))
val dummyID = ModuleID(sbtOrgTemp, modulePrefixTemp + sha1, sbtVersion, Some("component")) val dummyID = ModuleID(sbtOrgTemp, modulePrefixTemp + sha1, sbtVersion, Some("component"))
val moduleID = ModuleID(xsbti.ArtifactInfo.SbtOrganization, id, sbtVersion, Some("component")).sources() val moduleID = ModuleID(xsbti.ArtifactInfo.SbtOrganization + ".incrementalcompiler", id, sbtVersion, Some("component")).sources()
getModule(dummyID, Seq(moduleID)) getModule(dummyID, Seq(moduleID))
} }