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

Merge pull request #2965 from cunei/wip-bridge 

Update scalaCompilerBridgeSource
This commit is contained in:
eugene yokota 2017-02-15 14:42:07 -08:00 committed by GitHub
parent 517cbf6d2d b2bd1f745f
commit 105fcb5237
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main-actions/src/main/scala/sbt/Compiler.scala
View File

@ -19,13 +19,13 @@ object Compiler {
private[sbt] def defaultCompilerBridgeSource(sv: String): ModuleID = private[sbt] def defaultCompilerBridgeSource(sv: String): ModuleID =
VersionNumber(sv) match { VersionNumber(sv) match {
case VersionNumber(ns, _, _) if (ns.size == 3) && (ns(0) == 2) && (ns(1) <= 10) => scalaCompilerBridgeSource2_10 case VersionNumber(ns, _, _) if (ns.size == 3) && (ns(0) == 2) && (ns(1) <= 10) => scalaCompilerBridgeSource2_10
case _ => scalaCompilerBridgeSource2_11 case _ => scalaCompilerBridgeSource2_12
} }
private[sbt] def scalaCompilerBridgeSource2_10: ModuleID = private[sbt] def scalaCompilerBridgeSource2_10: ModuleID =
ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge_2.10", ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge_2.10",
ComponentCompiler.incrementalVersion).withConfigurations(Some("component")).sources() ComponentCompiler.incrementalVersion).withConfigurations(Some("component")).sources()
private[sbt] def scalaCompilerBridgeSource2_11: ModuleID = private[sbt] def scalaCompilerBridgeSource2_12: ModuleID =
ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge_2.11", ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge_2.12",
ComponentCompiler.incrementalVersion).withConfigurations(Some("component")).sources() ComponentCompiler.incrementalVersion).withConfigurations(Some("component")).sources()
/** Inputs necessary to run the incremental compiler. */ /** Inputs necessary to run the incremental compiler. */
@ -108,7 +108,7 @@ object Compiler {
{ {
val scalaProvider = app.provider.scalaProvider val scalaProvider = app.provider.scalaProvider
val instance = ScalaInstance(scalaProvider.version, scalaProvider.launcher) val instance = ScalaInstance(scalaProvider.version, scalaProvider.launcher)
val sourceModule = scalaCompilerBridgeSource2_11 val sourceModule = scalaCompilerBridgeSource2_12
compilers(instance, cpOptions, None, ivyConfiguration, fileToStore, sourceModule) compilers(instance, cpOptions, None, ivyConfiguration, fileToStore, sourceModule)
} }