diff --git a/main/actions/src/main/scala/sbt/Compiler.scala b/main/actions/src/main/scala/sbt/Compiler.scala index de1d5d660..5a65729da 100644 --- a/main/actions/src/main/scala/sbt/Compiler.scala +++ b/main/actions/src/main/scala/sbt/Compiler.scala @@ -19,8 +19,9 @@ import sbt.util.Logger object Compiler { val DefaultMaxErrors = 100 - private[sbt] def scalaCompilerBridgeSource(sbtver: String): ModuleID = - ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge", sbtver, Some("component")).cross(CrossVersion.binary).sources() + private[sbt] def scalaCompilerBridgeSource: ModuleID = + ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge", + ComponentCompiler.incrementalVersion, Some("component")).cross(CrossVersion.binary).sources() /** Inputs necessary to run the incremental compiler. */ final case class Inputs(compilers: Compilers, config: Options, incSetup: IncSetup) @@ -102,7 +103,7 @@ object Compiler { { val scalaProvider = app.provider.scalaProvider val instance = ScalaInstance(scalaProvider.version, scalaProvider.launcher) - val sourceModule = scalaCompilerBridgeSource(app.provider.id.version) + val sourceModule = scalaCompilerBridgeSource compilers(instance, cpOptions, None, ivyConfiguration, sourceModule) } diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 84faf5d74..5e1a255f6 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -246,7 +246,7 @@ object Defaults extends BuildCommon { val _ = clean.value IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log) }, - scalaCompilerBridgeSource := Compiler.scalaCompilerBridgeSource(sbtVersion.value) + scalaCompilerBridgeSource := Compiler.scalaCompilerBridgeSource ) // must be a val: duplication detected by object identity private[this] lazy val compileBaseGlobal: Seq[Setting[_]] = globalDefaults(Seq( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 64364d1ba..d339540a7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { // sbt modules val utilVersion = "0.1.0-M3" val ioVersion = "1.0.0-M3" - val incremenalcompilerVersion = "0.1.0-M1-746894baddb6d986a876160a656d72d2203e7613" + val incremenalcompilerVersion = "0.1.0-M1-7dabef5752ce69ffa240e1851401942d8b558347" val librarymanagementVersion = "0.1.0-M2" lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion