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

Fix the hardcoded ModuleID to compiler-interface

This commit is contained in:
Eugene Yokota 2015-09-14 22:04:19 -04:00
parent 0df130fbe2
commit 785c639805
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/compiler-ivy-integration/src/main/scala/sbt/compiler/ComponentCompiler.scala
View File

@ -45,8 +45,8 @@ private[sbt] object ComponentCompiler {
private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: ComponentManager, ivyConfiguration: IvyConfiguration, sourcesModule: ModuleID, log: Logger) { private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: ComponentManager, ivyConfiguration: IvyConfiguration, sourcesModule: ModuleID, log: Logger) {
import ComponentCompiler._ import ComponentCompiler._
private val incrementalCompilerOrg = xsbti.ArtifactInfo.SbtOrganization + ".incrementalcompiler" private val sbtOrg = xsbti.ArtifactInfo.SbtOrganization
private val xsbtiInterfaceModuleName = "interface" private val xsbtiInterfaceModuleName = "compiler-interface"
private val xsbtiInterfaceID = s"interface-$incrementalVersion" private val xsbtiInterfaceID = s"interface-$incrementalVersion"
private val sbtOrgTemp = JsonUtil.sbtOrgTemp private val sbtOrgTemp = JsonUtil.sbtOrgTemp
private val modulePrefixTemp = "temp-module-" private val modulePrefixTemp = "temp-module-"
@ -90,7 +90,7 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com
buffered bufferQuietly { buffered bufferQuietly {
IO withTemporaryDirectory { retrieveDirectory => IO withTemporaryDirectory { retrieveDirectory =>
val module = ModuleID(incrementalCompilerOrg, xsbtiInterfaceModuleName, incrementalVersion, Some("component")) val module = ModuleID(sbtOrg, xsbtiInterfaceModuleName, incrementalVersion, Some("component"))
val jarName = s"$xsbtiInterfaceModuleName-$incrementalVersion.jar" val jarName = s"$xsbtiInterfaceModuleName-$incrementalVersion.jar"
(update(getModule(module), retrieveDirectory)(_.getName == jarName)) match { (update(getModule(module), retrieveDirectory)(_.getName == jarName)) match {
case Some(interface) => case Some(interface) =>