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 9fab72636..b8cc94c26 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,12 @@ 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 sc if (sc startsWith "2.13.") => "compiler-bridge_2.13.0-RC1" + case _ => "compiler-bridge_2.13.0-RC1" } } import xsbti.ArtifactInfo.SbtOrganization diff --git a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala index c6df524bb..75e04d8ff 100644 --- a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala +++ b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala @@ -11,7 +11,7 @@ class ZincComponentCompilerSpec extends IvyBridgeProviderSpecification { val scala2121 = "2.12.1" val scala2122 = "2.12.2" val scala2123 = "2.12.3" - val scala2130M2 = "2.13.0-M2" + val scala2130RC1 = "2.13.0-RC1" def isJava8: Boolean = sys.props("java.specification.version") == "1.8" val logger = ConsoleLogger() @@ -35,7 +35,7 @@ class ZincComponentCompilerSpec extends IvyBridgeProviderSpecification { IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2123) should exist) } - it should "compile the bridge for Scala 2.13.0-M2" in { - IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2130M2) should exist) + it should "compile the bridge for Scala 2.13.0-RC1" in { + IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2130RC1) should exist) } }