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

use incremental compiler version instead of sbt version

This commit is contained in:
Eugene Yokota 2015-09-14 23:43:32 -04:00
parent 21a027c487
commit bb8133eaba
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/actions/src/main/scala/sbt/Compiler.scala
View File

@ -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)
}

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -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(

2
project/Dependencies.scala
View File

@ -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