From 7799afdef8a26fa9d7e4fd7fc2170453e78ccc85 Mon Sep 17 00:00:00 2001 From: Martin Duhem Date: Wed, 1 Jun 2016 15:58:20 +0200 Subject: [PATCH] Generate `ClasspathOptions` with sbt-datatype Also rename the previous object called `ClasspathOptions` to `ClasspathOptionsUtil`. --- .../src/main/scala/sbt/internal/inc/ComponentCompiler.scala | 2 +- .../scala/sbt/internal/inc/BridgeProviderSpecification.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ComponentCompiler.scala b/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ComponentCompiler.scala index f1aa399a4..6216c2d1e 100644 --- a/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ComponentCompiler.scala +++ b/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ComponentCompiler.scala @@ -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() } diff --git a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala index e435ea4c7..f5b78ad04 100644 --- a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala +++ b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala @@ -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)