luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-04 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Generate ClasspathOptions with sbt-datatype

Browse Source 
Also rename the previous object called `ClasspathOptions` to
`ClasspathOptionsUtil`.
This commit is contained in:
Martin Duhem
2016-06-01 16:22:58 +02:00
parent ba398b5b9c
commit 7799afdef8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ComponentCompiler.scala
+1 -1
View File
@@ -23,7 +23,7 @@ private[sbt] object ComponentCompiler {
def apply(scalaInstance: xsbti.compile.ScalaInstance, log: Logger): File =
{
// this is the instance used to compile the interface component
val componentCompiler = new IvyComponentCompiler(new RawCompiler(scalaInstance, ClasspathOptions.auto, log), manager, ivyConfiguration, sourcesModule, log)
val componentCompiler = new IvyComponentCompiler(new RawCompiler(scalaInstance, ClasspathOptionsUtil.auto, log), manager, ivyConfiguration, sourcesModule, log)
log.debug("Getting " + sourcesModule + " from component compiler for Scala " + scalaInstance.version)
componentCompiler()
}
internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala
+1 -1
View File
@@ -32,7 +32,7 @@ abstract class BridgeProviderSpecification extends BaseIvySpecification {
val bridgeId = compilerBridgeId(scalaVersion)
val sourceModule = ModuleID(xsbti.ArtifactInfo.SbtOrganization, bridgeId, ComponentCompiler.incrementalVersion, Some("component")).sources()
val raw = new RawCompiler(instance, ClasspathOptions.auto, log)
val raw = new RawCompiler(instance, ClasspathOptionsUtil.auto, log)
val manager = new ComponentManager(lock, provider(targetDir), None, log)
val componentCompiler = new IvyComponentCompiler(raw, manager, ivyConfiguration, sourceModule, log)