From 8c1e062fd1ad791be186f162c1de9bd960b937bc Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 28 Nov 2017 15:32:02 +0000 Subject: [PATCH] Support scala 2.13.0-pre-* & 2.13.0-M1 Fixes sbt/sbt#3771 Fixes sbt/zinc#460 --- .../sbt/internal/inc/ZincComponentCompiler.scala | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala b/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala index f64360a5f..33a9e7fd7 100644 --- a/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala +++ b/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala @@ -40,14 +40,15 @@ private[sbt] object ZincComponentCompiler { private val CompileConf = Some(Configurations.Compile.name) private[sbt] def getDefaultBridgeModule(scalaVersion: String): ModuleID = { def compilerBridgeId(scalaVersion: String) = { - // Defaults to bridge for 2.12 for Scala versions bigger than 2.12.x 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 sc if (sc startsWith "2.13.0-M") => "compiler-bridge_2.13.0-M2" - case sc if (sc startsWith "2.13.0-RC") => "compiler-bridge_2.13.0-M2" - 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 sc if (sc startsWith "2.13.0-pre-") => "compiler-bridge_2.13.0-M2" + case sc if (sc startsWith "2.13.0-M") => "compiler-bridge_2.13.0-M2" + case sc if (sc startsWith "2.13.0-RC") => "compiler-bridge_2.13.0-M2" + case _ => "compiler-bridge_2.13" } } import xsbti.ArtifactInfo.SbtOrganization