From 24dba24b2a1d56fab523b5b4cc7941fbe0d1aa8f Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 31 Mar 2021 13:53:30 +0200 Subject: [PATCH] Fix Scala 2.13-3.0 sandwich on Scala >= 3.0.0 The binary version of Scala >= 3.0.0 will be 3, but the logic was hardcoded for 3.0. --- main/src/main/scala/sbt/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 2f06f890e..5a491f973 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3786,7 +3786,7 @@ object Classpaths { private[sbt] def isScala2Scala3Sandwich(sbv1: String, sbv2: String): Boolean = { def compare(a: String, b: String): Boolean = - a == "2.13" && (b.startsWith("0.") || b.startsWith("3.0")) + a == "2.13" && (b.startsWith("0.") || b.startsWith("3")) compare(sbv1, sbv2) || compare(sbv2, sbv1) }