From d30556f19e7494366e52df9b7fb6d3cd1961ad0d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 12 Oct 2018 05:22:39 -0400 Subject: [PATCH] Refactor compiler bridge unit test This refactors the compiler bridge unit test to use the normal Zinc facility, namely AnalyzingCompiler that's built on Scala 2.12, but is capable of driving the compiler bridge built on non-2.12. This allows us to run the unit tests without any additional dependencies published for Scala 2.13.0-M5. --- .../main/scala/sbt/internal/inc/ZincComponentCompiler.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 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 69963e12b..9fab72636 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 @@ -44,9 +44,9 @@ private[sbt] object ZincComponentCompiler { 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 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" } }