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

Switch back to unsuffixed 2.13 compiler bridge sources 

Using the newer zinc version there now is a compiler bridge source jar
with suffix _2.13.
This commit is contained in:
Dale Wijnand 2019-04-28 23:41:41 +01:00
parent 481db003af
commit 736a1fa624
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala
View File

@ -40,14 +40,11 @@ private[sbt] object ZincComponentCompiler {
private[sbt] def getDefaultBridgeModule(scalaVersion: String): ModuleID = {
def compilerBridgeId(scalaVersion: String) = {
scalaVersion match {
case sc if (sc startsWith "2.10.") => "compiler-bridge_2.10"
case sc if (sc startsWith "2.11.") => "compiler-bridge_2.11"
case sc if (sc startsWith "2.12.") => "compiler-bridge_2.12"
case "2.13.0-M1" => "compiler-bridge_2.12"
case sc if (sc startsWith "2.13.0-pre-") => "compiler-bridge_2.13.0-M5"
case sc if (sc startsWith "2.13.0-M") => "compiler-bridge_2.13.0-M5"
case sc if (sc startsWith "2.13.0-RC") => "compiler-bridge_2.13.0-M5"
case _ => "compiler-bridge_2.13"
case sc if (sc startsWith "2.10.") => "compiler-bridge_2.10"
case sc if (sc startsWith "2.11.") => "compiler-bridge_2.11"
case sc if (sc startsWith "2.12.") => "compiler-bridge_2.12"
case "2.13.0-M1" => "compiler-bridge_2.12"
case _ => "compiler-bridge_2.13"
}
}
import xsbti.ArtifactInfo.SbtOrganization